diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index d8b7d3ed0..38c4596b5 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1032,6 +1032,9 @@ public class XmppConnectionService extends Service {
                 return START_STICKY;
             case ACTION_TEMPORARILY_DISABLE:
                 toggleSoftDisabled(true);
+                if (checkListeners()) {
+                    stopSelf();
+                }
                 return START_NOT_STICKY;
         }
         manageAccountConnectionStates(action, intent == null ? null : intent.getExtras());