diff --git a/src/app/grid/page.tsx b/src/app/grid/page.tsx
index 9b2b4a6c..52fb1571 100644
--- a/src/app/grid/page.tsx
+++ b/src/app/grid/page.tsx
@@ -13,6 +13,8 @@ import { getPhotoSidebarDataCached } from '@/photo/data';
 import { MorePhotosGrid } from '@/photo/MorePhotosGrid';
 import { Suspense } from 'react';
 
+export const revalidate = 3600;
+
 export async function generateMetadata(): Promise<Metadata> {
   const photos = await getPhotosCached({ limit: MAX_PHOTOS_TO_SHOW_OG });
   return generateOgImageMetaForPhotos(photos);
@@ -53,6 +55,8 @@ export default async function GridPage() {
         </div>}
         sideHiddenOnMobile
       />
-      : <PhotosEmptyState />
+      : <Suspense>
+        <PhotosEmptyState />
+      </Suspense> 
   );
 }
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 867edecd..a7098e44 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -41,6 +41,8 @@ export default async function HomePage() {
           />
         </Suspense>
       </div>
-      : <PhotosEmptyState />
+      : <Suspense>
+        <PhotosEmptyState />
+      </Suspense>
   );
 }