diff --git a/packages/frontend-2/components/auth/LoginPanel.vue b/packages/frontend-2/components/auth/LoginPanel.vue
index ece8aa6c10..9045f187da 100644
--- a/packages/frontend-2/components/auth/LoginPanel.vue
+++ b/packages/frontend-2/components/auth/LoginPanel.vue
@@ -1,6 +1,7 @@
 <template>
   <Component
     :is="concreteComponent"
+    v-if="!isLoggedIn"
     fancy-glow
     no-shadow
     class="max-w-lg mx-auto w-full"
@@ -43,6 +44,7 @@
       </div>
     </div>
   </Component>
+  <div v-else />
 </template>
 <script setup lang="ts">
 import { useQuery } from '@vue/apollo-composable'
@@ -67,6 +69,7 @@ const props = withDefaults(
   }
 )
 
+const { isLoggedIn } = useActiveUser()
 const { inviteToken } = useAuthManager()
 const router = useRouter()
 
diff --git a/packages/frontend-2/components/project/page/latest-items/comments/EmptyState.vue b/packages/frontend-2/components/project/page/latest-items/comments/EmptyState.vue
index baf9e2fb97..4efb2ab2bb 100644
--- a/packages/frontend-2/components/project/page/latest-items/comments/EmptyState.vue
+++ b/packages/frontend-2/components/project/page/latest-items/comments/EmptyState.vue
@@ -35,7 +35,7 @@
       </svg>
     </template>
     <template #cta>
-      <div v-if="small" class="mt-3">
+      <div v-if="small && canPostComment" class="mt-3">
         <FormButton
           size="sm"
           :icon-left="PlusIcon"
@@ -49,6 +49,7 @@
 </template>
 <script setup lang="ts">
 import { PlusIcon } from '@heroicons/vue/24/solid'
+import { useCheckViewerCommentingAccess } from '~/lib/viewer/composables/commentManagement'
 
 defineEmits<{
   (e: 'new-discussion'): void
@@ -57,4 +58,6 @@ defineEmits<{
 defineProps<{
   small?: boolean
 }>()
+
+const canPostComment = useCheckViewerCommentingAccess()
 </script>
diff --git a/packages/frontend-2/components/viewer/AnchoredPoints.vue b/packages/frontend-2/components/viewer/AnchoredPoints.vue
index 1050aa38a9..c3fe12f578 100644
--- a/packages/frontend-2/components/viewer/AnchoredPoints.vue
+++ b/packages/frontend-2/components/viewer/AnchoredPoints.vue
@@ -212,7 +212,8 @@ const onThreadExpandedChange = (isExpanded: boolean) => {
 }
 
 const shouldShowNewThread = computed(
-  () => !isEmbedEnabled.value && !state.ui.measurement.enabled.value
+  () =>
+    !isEmbedEnabled.value && !state.ui.measurement.enabled.value && canPostComment.value
 )
 
 const allThreadsChronologicalOrder = computed(() => {
diff --git a/packages/frontend-2/components/viewer/anchored-point/NewThread.vue b/packages/frontend-2/components/viewer/anchored-point/NewThread.vue
index 000c266af6..e675c8d65e 100644
--- a/packages/frontend-2/components/viewer/anchored-point/NewThread.vue
+++ b/packages/frontend-2/components/viewer/anchored-point/NewThread.vue
@@ -116,12 +116,15 @@ const isPostingNewThread = ref(false)
 //   width: 320
 // })
 const createThread = useSubmitComment()
+const { isLoggedIn } = useActiveUser()
 
 const onThreadClick = () => {
   const newIsExpanded = !props.modelValue.isExpanded
 
-  if (!props.canPostComment) {
-    emit('login')
+  if (!isLoggedIn.value || !props.canPostComment) {
+    if (!isLoggedIn.value) {
+      emit('login')
+    }
     return
   }
 
diff --git a/packages/frontend-2/components/viewer/anchored-point/Thread.vue b/packages/frontend-2/components/viewer/anchored-point/Thread.vue
index 6b8e733d7f..71a9206a05 100644
--- a/packages/frontend-2/components/viewer/anchored-point/Thread.vue
+++ b/packages/frontend-2/components/viewer/anchored-point/Thread.vue
@@ -162,7 +162,7 @@
               </FormButton>
             </div>
             <div
-              v-if="!canReply && !isEmbedEnabled"
+              v-if="!canReply && !isEmbedEnabled && !isLoggedIn"
               class="p-3 flex flex-col items-center justify-center bg-foundation-2"
             >
               <FormButton full-width @click="$emit('login')">Reply</FormButton>
@@ -229,7 +229,7 @@ const { isEmbedEnabled } = useEmbed()
 
 const threadId = computed(() => props.modelValue.id)
 const { copy } = useClipboard()
-const { activeUser } = useActiveUser()
+const { activeUser, isLoggedIn } = useActiveUser()
 const { isSmallerOrEqualSm } = useIsSmallerOrEqualThanBreakpoint()
 
 const archiveComment = useArchiveComment()
diff --git a/packages/frontend-2/lib/viewer/composables/commentManagement.ts b/packages/frontend-2/lib/viewer/composables/commentManagement.ts
index d35f3e40fe..475903e848 100644
--- a/packages/frontend-2/lib/viewer/composables/commentManagement.ts
+++ b/packages/frontend-2/lib/viewer/composables/commentManagement.ts
@@ -223,6 +223,7 @@ export function useCheckViewerCommentingAccess() {
     }
   } = useInjectedViewerState()
   const { activeUser } = useActiveUser()
+
   return computed(() => {
     if (!activeUser.value) return false