diff --git a/src/roommanager.cpp b/src/roommanager.cpp
index b94142a8f..01c18a765 100644
--- a/src/roommanager.cpp
+++ b/src/roommanager.cpp
@@ -315,7 +315,9 @@ void RoomManager::visitRoom(Room *r, const QString &eventId)
 
     // It's important that we compare room *objects* here, not just room *ids*, since we need to deal with the object changing when going invite -> joined
     if (m_currentRoom && m_currentRoom == room) {
-        Q_EMIT goToEvent(eventId);
+        if (!eventId.isEmpty()) {
+            Q_EMIT goToEvent(eventId);
+        }
     } else {
         setCurrentRoom(room->id());
     }