diff --git a/packages/frontend-2/components/projects/Dashboard.vue b/packages/frontend-2/components/projects/Dashboard.vue
index 5d6117b25..b0c0c998f 100644
--- a/packages/frontend-2/components/projects/Dashboard.vue
+++ b/packages/frontend-2/components/projects/Dashboard.vue
@@ -40,6 +40,7 @@
     <CommonLoadingBar :loading="showLoadingBar" class="my-2" />
     <ProjectsDashboardEmptyState
       v-if="showEmptyState"
+      :is-guest="isGuest"
       @create-project="openNewProject = true"
     />
     <template v-else-if="projects?.items?.length">
diff --git a/packages/frontend-2/components/projects/DashboardEmptyState.vue b/packages/frontend-2/components/projects/DashboardEmptyState.vue
index 6006d6201..45aecc762 100644
--- a/packages/frontend-2/components/projects/DashboardEmptyState.vue
+++ b/packages/frontend-2/components/projects/DashboardEmptyState.vue
@@ -14,9 +14,9 @@
   </div>
 </template>
 <script setup lang="ts">
-import { useActiveUser } from '~~/lib/auth/composables/activeUser'
+defineProps<{
+  isGuest: boolean
+}>()
 
 defineEmits(['create-project'])
-
-const { isGuest } = useActiveUser()
 </script>
diff --git a/packages/frontend-2/components/workspace/ProjectList.vue b/packages/frontend-2/components/workspace/ProjectList.vue
index 1aefa5c5a..8f6adfeef 100644
--- a/packages/frontend-2/components/workspace/ProjectList.vue
+++ b/packages/frontend-2/components/workspace/ProjectList.vue
@@ -22,7 +22,7 @@
           v-bind="bind"
           v-on="on"
         />
-        <FormButton v-if="!isGuest" @click="openNewProject = true">
+        <FormButton v-if="!isWorkspaceGuest" @click="openNewProject = true">
           New project
         </FormButton>
       </div>
@@ -32,6 +32,7 @@
 
     <ProjectsDashboardEmptyState
       v-if="showEmptyState"
+      :is-guest="isWorkspaceGuest"
       @create-project="openNewProject = true"
     />
 
@@ -49,7 +50,6 @@
 <script setup lang="ts">
 import { MagnifyingGlassIcon, Squares2X2Icon } from '@heroicons/vue/24/outline'
 import { useQuery, useQueryLoading } from '@vue/apollo-composable'
-import { useActiveUser } from '~~/lib/auth/composables/activeUser'
 import type { Optional, StreamRoles } from '@speckle/shared'
 import {
   workspacePageQuery,
@@ -64,6 +64,7 @@ import type {
 } from '~~/lib/common/generated/gql/graphql'
 import { skipLoggingErrorsIfOneFieldError } from '~/lib/common/helpers/graphql'
 import { workspaceRoute, workspacesRoute } from '~/lib/common/helpers/route'
+import { Roles } from '@speckle/shared'
 
 graphql(`
   fragment WorkspaceProjectList_ProjectCollection on ProjectCollection {
@@ -78,7 +79,6 @@ graphql(`
 const selectedRoles = ref(undefined as Optional<StreamRoles[]>)
 const openNewProject = ref(false)
 
-const { isGuest } = useActiveUser()
 const areQueriesLoading = useQueryLoading()
 
 const props = defineProps<{
@@ -148,6 +148,8 @@ const showLoadingBar = computed(() => {
   return areQueriesLoading.value && (!!search.value || !projects.value?.items?.length)
 })
 
+const isWorkspaceGuest = computed(() => workspace.value?.role === Roles.Workspace.Guest)
+
 const clearSearch = () => {
   search.value = ''
   selectedRoles.value = []
diff --git a/packages/frontend-2/components/workspace/header/Header.vue b/packages/frontend-2/components/workspace/header/Header.vue
index 24e944595..9d29dc27e 100644
--- a/packages/frontend-2/components/workspace/header/Header.vue
+++ b/packages/frontend-2/components/workspace/header/Header.vue
@@ -28,8 +28,8 @@
         class="max-w-[104px]"
       />
       <FormButton
+        v-if="isWorkspaceAdmin"
         color="outline"
-        :disabled="!isWorkspaceAdmin"
         @click="showInviteDialog = !showInviteDialog"
       >
         Invite
diff --git a/packages/frontend-2/lib/projects/composables/projectManagement.ts b/packages/frontend-2/lib/projects/composables/projectManagement.ts
index dfefb2891..83e261a56 100644
--- a/packages/frontend-2/lib/projects/composables/projectManagement.ts
+++ b/packages/frontend-2/lib/projects/composables/projectManagement.ts
@@ -119,6 +119,12 @@ export function useCreateProject() {
       .mutate({
         mutation: createProjectMutation,
         variables: { input },
+        errorPolicy: 'all',
+        context: {
+          skipLoggingErrors: (err) =>
+            err.graphQLErrors?.length === 1 &&
+            err.graphQLErrors.some((e) => e.path?.includes('invitedTeam'))
+        },
         update: (cache, { data }) => {
           const newProject = data?.projectMutations.create