diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index ec5f2da3c..1b5f79564 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -673,9 +673,14 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
         if (inConversation) {
             if (wasDetached && conversationUser.hasSpreedFeatureCapability("no-ping")) {
-                currentConversation.setSessionId("0");
-                wasDetached = false;
-                joinRoomWithPassword();
+                if (currentConversation != null) {
+                    currentConversation.setSessionId("0");
+                    wasDetached = false;
+                    joinRoomWithPassword();
+                } else {
+                    wasDetached = false;
+                    getRoomInfo();
+                }
             }
         }
     }