diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index c59b6687a809..db010429980a 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -130,14 +130,14 @@ function WorkspaceNewRoomPage(props) {
     );
 
     useEffect(() => {
-        if (Permissions.canUsePolicyRooms(props.betas)) {
+        if (Permissions.canUsePolicyRooms(props.betas) && workspaceOptions.length) {
             return;
         }
         Log.info('Not showing create Policy Room page since user is not on policy rooms beta');
         Navigation.dismissModal();
-    }, [props.betas]);
+    }, [props.betas, workspaceOptions]);
 
-    if (!Permissions.canUsePolicyRooms(props.betas)) {
+    if (!Permissions.canUsePolicyRooms(props.betas) || !workspaceOptions.length) {
         return null;
     }