From a4e26dba8210d9e00c363cdd724c079159f844cf Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:25:42 -0500
Subject: [PATCH] fix merge confligt

---
 web/src/pages/Explore.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index 0a877a148..5299b52fb 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -225,10 +225,11 @@ export default function Explore() {
   };
 
   if (
-    !textModelState ||
-    !textTokenizerState ||
-    !visionModelState ||
-    !visionFeatureExtractorState
+    config?.semantic_search.enabled &&
+    (!textModelState ||
+      !textTokenizerState ||
+      !visionModelState ||
+      !visionFeatureExtractorState)
   ) {
     return (
       <ActivityIndicator className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" />