diff --git a/resources/views/livewire/feed.blade.php b/resources/views/livewire/feed.blade.php
index b963e6f53..88fa847ee 100644
--- a/resources/views/livewire/feed.blade.php
+++ b/resources/views/livewire/feed.blade.php
@@ -1,21 +1,23 @@
 <div>
     <section class="mb-12 min-h-screen space-y-10">
         @forelse ($questions as $question)
-            @if($hashtag !== null)
-                <livewire:questions.show
-                    :questionId="$question->id"
-                    :key="'question-' . $question->id"
-                    :inIndex="true"
-                />
-            @else
-                <x-thread
-                    :rootId="$question->root_id"
-                    :grandParentId="$question->grand_parent_id"
-                    :parentId="$question->parent_id"
-                    :questionId="$question->id"
-                    :username="$question->username"
-                />
-            @endif
+            <div wire:key="thread-{{ $question->id }}">
+                @if($hashtag !== null && $hashtag !== '')
+                    <livewire:questions.show
+                        :questionId="$question->id"
+                        :key="'question-' . $question->id"
+                        :inIndex="true"
+                    />
+                @else
+                    <x-thread
+                        :rootId="$question->root_id"
+                        :grandParentId="$question->grand_parent_id"
+                        :parentId="$question->parent_id"
+                        :questionId="$question->id"
+                        :username="$question->username"
+                    />
+                @endif
+            </div>
         @empty
             <div class="text-center dark:text-slate-400 text-slate-600">There are no questions to show.</div>
         @endforelse