diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 1397ae5623fdeb63d3cf794d3894bb6b554f2155..c96fcec082227590f71449013e9392e6b33273e9 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1148,7 +1148,7 @@ public class XmppConnectionService extends Service {
                 Log.d(Config.LOGTAG, "ping MUCs");
                 mLastMucPing = SystemClock.elapsedRealtime();
                 for (Conversation c : getConversations()) {
-                    if (c.getMode() == Conversation.MODE_MULTI && c.getMucOptions().online()) {
+                    if (c.getMode() == Conversation.MODE_MULTI && (c.getMucOptions().online() || c.getMucOptions().getError() == MucOptions.Error.SHUTDOWN)) {
                         mucSelfPingAndRejoin(c);
                     }
                 }