diff --git a/src/app/roommanager.cpp b/src/app/roommanager.cpp
index a6351fb3d..ee959d086 100644
--- a/src/app/roommanager.cpp
+++ b/src/app/roommanager.cpp
@@ -576,7 +576,8 @@ void RoomManager::setCurrentRoom(const QString &roomId)
         return;
     }
     if (m_currentRoom->isDirectChat()) {
-        if (m_currentSpaceId != "DM"_L1) {
+        const auto roomsInSpace = SpaceHierarchyCache::instance().getRoomListForSpace(m_currentSpaceId, false);
+        if (!roomsInSpace.contains(m_currentRoom->id()) && m_currentSpaceId != "DM"_L1) {
             setCurrentSpace("DM"_L1, false);
         }
         return;