diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 8a9549d9..558bf97c 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1183,6 +1183,9 @@ function configure_imap {
         rm /var/lib/dovecot/ssl-parameters.dat
     fi
 
+    if [ -f /etc/systemd/system/sockets.target.wants/dovecot.socket ]; then
+        rm /etc/systemd/system/sockets.target.wants/dovecot.socket
+    fi
     systemctl restart dovecot
     mark_completed $FUNCNAME
 }