diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml
index bd0c26a420fc952e47e9f04f2fa51a38e6697d51..25ac54d51cdca07a93782450fb5dc742875b221c 100644
--- a/roles/xmpp_server/tasks/main.yml
+++ b/roles/xmpp_server/tasks/main.yml
@@ -21,6 +21,12 @@
     mode: 0644
   when: "ansible_distribution_release == 'stretch'"
 
+- name: Drop the Pin lua-ldap package (if machine was upgraded from Debian Stretch)
+  file:
+    path: "/etc/apt/preferences.d/lua-ldap"
+    state: absent
+  when: "ansible_distribution_release != 'stretch'"
+
 - name: Add Prosody repository apt key
   apt_key:
     data: "{{ lookup('file', 'prosody-debian-packages.gpg') }}"