diff --git a/app/javascript/flavours/glitch/components/navigation_focus_target/index.tsx b/app/javascript/flavours/glitch/components/navigation_focus_target/index.tsx
index ceb26842db..1b86102fdf 100644
--- a/app/javascript/flavours/glitch/components/navigation_focus_target/index.tsx
+++ b/app/javascript/flavours/glitch/components/navigation_focus_target/index.tsx
@@ -55,13 +55,11 @@ export const FocusTargetProvider: React.FC<{
     | null
   >(null);
 
-  const {
-    pathname,
-    search,
-    state = {},
-  } = useLocation<{ focusTarget?: FocusTarget } | undefined>();
+  const { pathname, search, state } = useLocation<{
+    focusTarget?: FocusTarget;
+  } | null>();
 
-  const { focusTarget } = state;
+  const { focusTarget } = state ?? {};
 
   useLayoutEffect(() => {
     // We never want to set focus on page load, so we keep