diff --git a/lib/pangea/spaces/controllers/space_code_controller.dart b/lib/pangea/spaces/controllers/space_code_controller.dart
index cd559f317..d20129f1a 100644
--- a/lib/pangea/spaces/controllers/space_code_controller.dart
+++ b/lib/pangea/spaces/controllers/space_code_controller.dart
@@ -52,7 +52,10 @@ class SpaceCodeController extends BaseController {
     );
 
     if (spaceId != null) {
-      context.go('/rooms/spaces/$spaceId/details');
+      final room = _pangeaController.matrixState.client.getRoomById(spaceId);
+      room?.isSpace ?? true
+          ? context.go('/rooms/spaces/$spaceId/details')
+          : context.go('/rooms/${room?.id}');
       return spaceId;
     }