diff --git a/src/App.css b/src/App.css
index 356b93a..e2c7ce3 100644
--- a/src/App.css
+++ b/src/App.css
@@ -4,7 +4,7 @@
   --safe-area-inset-bottom: env(safe-area-inset-bottom);
   --safe-area-inset-right: env(safe-area-inset-right);
   background-color: var(--tutu-color-surface, transparent);
-  overscroll-behavior-block: none;
+  overscroll-behavior-block: contain;
 }
 
 .custom-emoji {
diff --git a/src/masto/timelines.ts b/src/masto/timelines.ts
index 2e49145..ce73490 100644
--- a/src/masto/timelines.ts
+++ b/src/masto/timelines.ts
@@ -38,6 +38,7 @@ export function useTimeline(
     async ([tl], info) => {
       let tlChanged = false;
       if (otl !== tl) {
+        console.debug("timeline reset");
         npager = opager = undefined;
         otl = tl;
         tlChanged = true;
diff --git a/src/material/BottomSheet.module.css b/src/material/BottomSheet.module.css
index f73f562..adddddb 100644
--- a/src/material/BottomSheet.module.css
+++ b/src/material/BottomSheet.module.css
@@ -11,7 +11,7 @@
   width: 100%;
   max-width: 560px;
   border-radius: 2px;
-  overscroll-behavior: none;
+  overscroll-behavior: contain;
   max-height: 100vh;
   max-height: 100dvh;
 
diff --git a/src/timelines/Home.tsx b/src/timelines/Home.tsx
index 3ce4ce1..39f3dec 100644
--- a/src/timelines/Home.tsx
+++ b/src/timelines/Home.tsx
@@ -430,42 +430,40 @@ const Home: ParentComponent = (props) => {
         }
       >
         <TimeSourceProvider value={now}>
-          <Show when={!!client()}>
-            <div class="panel-list" ref={panelList!}>
-              <div class="tab-panel">
-                <div>
-                  <TimelinePanel
-                    client={client()}
-                    name="home"
-                    prefetch={prefetching()}
-                    openFullScreenToot={openFullScreenToot}
-                  />
-                </div>
+          <div class="panel-list" ref={panelList!}>
+            <div class="tab-panel">
+              <div>
+                <TimelinePanel
+                  client={client()}
+                  name="home"
+                  prefetch={prefetching()}
+                  openFullScreenToot={openFullScreenToot}
+                />
               </div>
-              <div class="tab-panel">
-                <div>
-                  <TimelinePanel
-                    client={client()}
-                    name="trends"
-                    prefetch={prefetching()}
-                    openFullScreenToot={openFullScreenToot}
-                    fullRefetch={120}
-                  />
-                </div>
-              </div>
-              <div class="tab-panel">
-                <div>
-                  <TimelinePanel
-                    client={client()}
-                    name="public"
-                    prefetch={prefetching()}
-                    openFullScreenToot={openFullScreenToot}
-                  />
-                </div>
-              </div>
-              <div></div>
             </div>
-          </Show>
+            <div class="tab-panel">
+              <div>
+                <TimelinePanel
+                  client={client()}
+                  name="trends"
+                  prefetch={prefetching()}
+                  openFullScreenToot={openFullScreenToot}
+                  fullRefetch={120}
+                />
+              </div>
+            </div>
+            <div class="tab-panel">
+              <div>
+                <TimelinePanel
+                  client={client()}
+                  name="public"
+                  prefetch={prefetching()}
+                  openFullScreenToot={openFullScreenToot}
+                />
+              </div>
+            </div>
+            <div></div>
+          </div>
         </TimeSourceProvider>
         <Suspense>
           <HeroSourceProvider value={[heroSrc, setHeroSrc]}>