diff --git a/packages/frontend-2/components/project/page/latest-items/comments/Grid.vue b/packages/frontend-2/components/project/page/latest-items/comments/Grid.vue
index 5077921b1..943ad0ae0 100644
--- a/packages/frontend-2/components/project/page/latest-items/comments/Grid.vue
+++ b/packages/frontend-2/components/project/page/latest-items/comments/Grid.vue
@@ -1,12 +1,14 @@
 <template>
-  <div class="grid grid-cols-4 gap-4">
+  <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4">
     <template v-if="projectId">
+      <!-- TODO: remove this once we have a way to limit the number of comments -->
       <ProjectPageLatestItemsCommentsGridItem
         v-for="item in items"
         :key="item.id"
         class="col-span-4 md:col-span-2 lg:col-span-1"
         :thread="item"
         :project-id="projectId"
+        :limited="true"
       />
     </template>
   </div>
diff --git a/packages/frontend-2/components/project/page/latest-items/comments/GridItem.vue b/packages/frontend-2/components/project/page/latest-items/comments/GridItem.vue
index d18fb909b..f274af035 100644
--- a/packages/frontend-2/components/project/page/latest-items/comments/GridItem.vue
+++ b/packages/frontend-2/components/project/page/latest-items/comments/GridItem.vue
@@ -1,39 +1,49 @@
 <template>
   <NuxtLink
-    class="group relative h-60 rounded-md flex items-stretch overflow-hidden transition-all border border-outline-3 hover:border-outline-5 bg-foundation-page"
-    :to="threadLink"
+    class="group relative h-60 rounded-md flex flex-col overflow-hidden transition-all border border-outline-3 bg-foundation-page"
+    :to="limited ? undefined : threadLink"
+    :class="limited ? 'cursor-default' : 'cursor-pointer hover:border-outline-5'"
   >
     <!-- Image preview -->
+    <div v-if="!limited" class="w-full h-44 overflow-hidden">
+      <div
+        class="w-full h-full cover scale-125 group-hover:scale-100 transition"
+        :style="{
+          backgroundImage: `url(${screenshot})`,
+          backgroundSize: 'cover',
+          backgroundPosition: 'center center'
+        }"
+      />
+    </div>
     <div
-      class="absolute w-full h-full cover scale-125 group-hover:scale-100 transition xxxduration-700"
-      :style="{
-        backgroundImage: `url(${screenshot})`,
-        backgroundSize: 'cover',
-        backgroundPosition: 'center center'
-      }"
-    ></div>
-    <div class="absolute w-full h-full flex items-end">
-      <div class="flex flex-col w-full">
-        <div class="flex items-center w-full px-2">
-          <UserAvatarGroup
-            v-if="!thread.archived"
-            v-tippy="
-              `${thread.author.name} ${
-                allAvatars.length !== 1
-                  ? '& ' + (allAvatars.length - 1) + ' others'
-                  : ''
-              }`
-            "
-            :users="allAvatars"
-            :max-count="4"
-          />
-          <CheckCircleIcon v-else class="w-8 h-8 text-primary" />
-        </div>
-        <div class="mt-2 p-2 bg-foundation-2 border-t">
-          <div class="truncate text-body-xs text-foreground-3">
+      v-else
+      class="w-full h-48 flex items-center justify-center diagonal-stripes px-3 pb-8"
+    >
+      <ViewerResourcesUpgradeLimitAlert
+        class="!bg-foundation"
+        text="Upgrade to see comments older than (count) days."
+      />
+    </div>
+    <div class="flex items-center w-full px-3 h-8 -mt-10">
+      <UserAvatarGroup
+        v-if="!thread.archived"
+        v-tippy="
+          `${thread.author.name} ${
+            allAvatars.length !== 1 ? '& ' + (allAvatars.length - 1) + ' others' : ''
+          }`
+        "
+        :users="allAvatars"
+        :max-count="4"
+      />
+      <CheckCircleIcon v-else class="w-8 h-8 text-primary" />
+    </div>
+    <div class="w-full" :class="limited ? 'h-14' : 'h-16'">
+      <div class="flex flex-col w-full h-full">
+        <div class="mt-2 py-2 px-4 bg-foundation border-t h-full">
+          <div v-if="!limited" class="truncate text-body-xs text-foreground">
             {{ thread.rawText }}
           </div>
-          <div class="space-x-2">
+          <div class="space-x-2" :class="limited ? 'mt-0.5' : ''">
             <span class="text-body-2xs font-medium text-primary">
               {{ thread.repliesCount.totalCount }}
               {{ thread.repliesCount.totalCount === 1 ? 'reply' : 'replies' }}
@@ -58,6 +68,7 @@ import type { AvatarUserWithId } from '@speckle/ui-components'
 const props = defineProps<{
   thread: ProjectPageLatestItemsCommentItemFragment
   projectId: string
+  limited?: boolean
 }>()
 
 const { screenshot } = useCommentScreenshotImage(