From 7fb9eb452b8d29791d672e3111a9446e55922f3e Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Sat, 13 Jun 2026 14:32:17 +0200
Subject: [PATCH] [Glitch] Prevent crash trying to access nullish location
 state

Port 4fce6e0f7338ee6d6a791039357e8dd69adc206e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/navigation_focus_target/index.tsx       | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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