diff --git a/lib/plexus_web/components/core_components.ex b/lib/plexus_web/components/core_components.ex
index e1a830c6..bbfcce28 100644
--- a/lib/plexus_web/components/core_components.ex
+++ b/lib/plexus_web/components/core_components.ex
@@ -488,8 +488,8 @@ defmodule PlexusWeb.CoreComponents do
         <tbody
           id={@id}
           phx-update={match?(%Phoenix.LiveView.LiveStream{}, @rows) && "stream"}
-          phx-viewport-top={match?(%Phoenix.LiveView.LiveStream{}, @rows) && @viewport_top}
-          phx-viewport-bottom={match?(%Phoenix.LiveView.LiveStream{}, @rows) && @viewport_bottom}
+          phx-viewport-top={match?(%Phoenix.LiveView.LiveStream{}, @rows) && assigns[:viewport_top]}
+          phx-viewport-bottom={match?(%Phoenix.LiveView.LiveStream{}, @rows) && assigns[:viewport_bottom]}
           phx-page-loading
           class="relative divide-y divide-zinc-100 border-t border-zinc-200 text-sm leading-6 text-zinc-700"
         >