From 21f90e7e0d0439f9a27a7c8637547bb8829b2d09 Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:08:02 +0100
Subject: [PATCH] fix(nav): handle search disabled/error states to stop
 skeleton loading

---
 client/src/hooks/Conversations/useSearchEnabled.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/hooks/Conversations/useSearchEnabled.ts b/client/src/hooks/Conversations/useSearchEnabled.ts
index d643833426..1b60869097 100644
--- a/client/src/hooks/Conversations/useSearchEnabled.ts
+++ b/client/src/hooks/Conversations/useSearchEnabled.ts
@@ -10,9 +10,12 @@ export default function useSearchEnabled(isAuthenticated: boolean) {
 
   useEffect(() => {
     if (searchEnabledQuery.data === true) {
-      setSearch((prev) => ({ ...prev, enabled: searchEnabledQuery.data }));
+      setSearch((prev) => ({ ...prev, enabled: true }));
+    } else if (searchEnabledQuery.data === false) {
+      setSearch((prev) => ({ ...prev, enabled: false }));
     } else if (searchEnabledQuery.isError) {
       logger.error('Failed to get search enabled: ', searchEnabledQuery.error);
+      setSearch((prev) => ({ ...prev, enabled: false }));
     }
   }, [searchEnabledQuery.data, searchEnabledQuery.error, searchEnabledQuery.isError, setSearch]);