diff --git a/src/components/Feed/Row2.tsx b/src/components/Feed/Row2.tsx
index 81be784c..6a6d52cb 100644
--- a/src/components/Feed/Row2.tsx
+++ b/src/components/Feed/Row2.tsx
@@ -19,29 +19,31 @@ export const Row2 = (props: {
   createComputed(() => setY(Math.floor(Math.random() * x.length)))
 
   return (
-    <div class="floor">
-      <div class="wide-container">
-        <div class="row">
-          <For each={props.articles}>
-            {(a, i) => {
-              return (
-                <Show when={!!a}>
-                  <div class={`col-md-${props.isEqual ? '12' : x[y()][i()]}`}>
-                    <ArticleCard
-                      article={a}
-                      settings={{
-                        isWithCover: props.isEqual || x[y()][i()] === '16',
-                        nodate: props.isEqual || props.nodate,
-                        noAuthorLink: props.noAuthorLink
-                      }}
-                    />
-                  </div>
-                </Show>
-              )
-            }}
-          </For>
+    <Show when={props.articles && props.articles.length > 0}>
+      <div class="floor">
+        <div class="wide-container">
+          <div class="row">
+            <For each={props.articles}>
+              {(a, i) => {
+                return (
+                  <Show when={!!a}>
+                    <div class={`col-md-${props.isEqual ? '12' : x[y()][i()]}`}>
+                      <ArticleCard
+                        article={a}
+                        settings={{
+                          isWithCover: props.isEqual || x[y()][i()] === '16',
+                          nodate: props.isEqual || props.nodate,
+                          noAuthorLink: props.noAuthorLink
+                        }}
+                      />
+                    </div>
+                  </Show>
+                )
+              }}
+            </For>
+          </div>
         </div>
       </div>
-    </div>
+    </Show>
   )
 }
diff --git a/src/components/Feed/Row3.tsx b/src/components/Feed/Row3.tsx
index 2a352b21..22890d24 100644
--- a/src/components/Feed/Row3.tsx
+++ b/src/components/Feed/Row3.tsx
@@ -1,5 +1,5 @@
 import type { JSX } from 'solid-js/jsx-runtime'
-import { For } from 'solid-js'
+import { For, Show } from 'solid-js'
 import type { Shout } from '../../graphql/types.gen'
 import { ArticleCard } from './ArticleCard'
 
@@ -10,22 +10,24 @@ export const Row3 = (props: {
   noAuthorLink?: boolean
 }) => {
   return (
-    <div class="floor">
-      <div class="wide-container">
-        <div class="row">
-          <div class="floor-header">{props.header}</div>
-          <For each={props.articles}>
-            {(a) => (
-              <div class="col-md-8">
-                <ArticleCard
-                  article={a}
-                  settings={{ nodate: props.nodate, noAuthorLink: props.noAuthorLink }}
-                />
-              </div>
-            )}
-          </For>
+    <Show when={props.articles && props.articles.length > 0}>
+      <div class="floor">
+        <div class="wide-container">
+          <div class="row">
+            <div class="floor-header">{props.header}</div>
+            <For each={props.articles}>
+              {(a) => (
+                <div class="col-md-8">
+                  <ArticleCard
+                    article={a}
+                    settings={{ nodate: props.nodate, noAuthorLink: props.noAuthorLink }}
+                  />
+                </div>
+              )}
+            </For>
+          </div>
         </div>
       </div>
-    </div>
+    </Show>
   )
 }