diff --git a/apps/web/src/components/SideNavigation.tsx b/apps/web/src/components/SideNavigation.tsx
index 76a3bfe1..ce032e69 100644
--- a/apps/web/src/components/SideNavigation.tsx
+++ b/apps/web/src/components/SideNavigation.tsx
@@ -55,9 +55,10 @@ export default function SideNavigation({
   const [isInitialised, setIsInitialised] = useState(false);
   const { openModal } = useModal();
 
-  const { data: workspaceData } = api.workspace.byId.useQuery({
-    workspacePublicId: workspace.publicId,
-  });
+  const { data: workspaceData } = api.workspace.byId.useQuery(
+    { workspacePublicId: workspace.publicId },
+    { enabled: !!workspace.publicId && workspace.publicId.length >= 12 },
+  );
 
   const subscriptions = workspaceData?.subscriptions as
     | Subscription[]
diff --git a/apps/web/src/views/members/index.tsx b/apps/web/src/views/members/index.tsx
index ca91c0d4..035be336 100644
--- a/apps/web/src/views/members/index.tsx
+++ b/apps/web/src/views/members/index.tsx
@@ -37,7 +37,7 @@ export default function MembersPage() {
 
   const { data, isLoading } = api.workspace.byId.useQuery(
     { workspacePublicId: workspace.publicId },
-    // { enabled: workspace?.publicId ? true : false },
+    { enabled: !!workspace.publicId && workspace.publicId.length >= 12 },
   );
 
   const { data: session } = authClient.useSession();
@@ -48,9 +48,11 @@ export default function MembersPage() {
 
   const updateRoleMutation = api.member.updateRole.useMutation({
     onSuccess: async () => {
-      await utils.workspace.byId.invalidate({
-        workspacePublicId: workspace.publicId,
-      });
+      if (workspace.publicId && workspace.publicId.length >= 12) {
+        await utils.workspace.byId.invalidate({
+          workspacePublicId: workspace.publicId,
+        });
+      }
 
       showPopup({
         header: t`Role updated`,
diff --git a/apps/web/src/views/settings/PermissionsSettings.tsx b/apps/web/src/views/settings/PermissionsSettings.tsx
index 10e98750..66647098 100644
--- a/apps/web/src/views/settings/PermissionsSettings.tsx
+++ b/apps/web/src/views/settings/PermissionsSettings.tsx
@@ -28,9 +28,11 @@ export default function PermissionsSettings() {
         });
 
         // Refresh any relevant workspace data
-        await utils.workspace.byId.invalidate({
-          workspacePublicId: workspace.publicId,
-        });
+        if (workspace.publicId && workspace.publicId.length >= 12) {
+          await utils.workspace.byId.invalidate({
+            workspacePublicId: workspace.publicId,
+          });
+        }
       },
       onError: () => {
         showPopup({
diff --git a/apps/web/src/views/settings/WorkspaceSettings.tsx b/apps/web/src/views/settings/WorkspaceSettings.tsx
index 175eeb84..008f89d7 100644
--- a/apps/web/src/views/settings/WorkspaceSettings.tsx
+++ b/apps/web/src/views/settings/WorkspaceSettings.tsx
@@ -31,9 +31,10 @@ export default function WorkspaceSettings() {
   const { data } = api.user.getUser.useQuery();
   const [hasOpenedUpgradeModal, setHasOpenedUpgradeModal] = useState(false);
 
-  const { data: workspaceData } = api.workspace.byId.useQuery({
-    workspacePublicId: workspace.publicId,
-  });
+  const { data: workspaceData } = api.workspace.byId.useQuery(
+    { workspacePublicId: workspace.publicId },
+    { enabled: !!workspace.publicId && workspace.publicId.length >= 12 },
+  );
 
   const subscriptions = workspaceData?.subscriptions as
     | Subscription[]
diff --git a/apps/web/src/views/settings/components/UpdateWorkspaceEmailVisibilityForm.tsx b/apps/web/src/views/settings/components/UpdateWorkspaceEmailVisibilityForm.tsx
index 1766cefb..2c783f0e 100644
--- a/apps/web/src/views/settings/components/UpdateWorkspaceEmailVisibilityForm.tsx
+++ b/apps/web/src/views/settings/components/UpdateWorkspaceEmailVisibilityForm.tsx
@@ -22,9 +22,11 @@ export default function UpdateWorkspaceEmailVisibilityForm({
 
   const updateWorkspace = api.workspace.update.useMutation({
     onSuccess: () => {
-      void utils.workspace.byId.invalidate({
-        workspacePublicId,
-      });
+      if (workspacePublicId && workspacePublicId.length >= 12) {
+        void utils.workspace.byId.invalidate({
+          workspacePublicId,
+        });
+      }
     },
   });