diff --git a/frigate/comms/dispatcher.py b/frigate/comms/dispatcher.py
index 4a3862eaf..1f480fa9c 100644
--- a/frigate/comms/dispatcher.py
+++ b/frigate/comms/dispatcher.py
@@ -179,6 +179,11 @@ class Dispatcher:
                 }
 
             self.publish("camera_activity", json.dumps(camera_status))
+            self.publish("model_state", json.dumps(self.model_state.copy()))
+            self.publish(
+                "embeddings_reindex_progress",
+                json.dumps(self.embeddings_reindex.copy()),
+            )
 
         # Dictionary mapping topic to handlers
         topic_handlers = {
diff --git a/web/src/components/Statusbar.tsx b/web/src/components/Statusbar.tsx
index 41bd9372f..1b20b26f6 100644
--- a/web/src/components/Statusbar.tsx
+++ b/web/src/components/Statusbar.tsx
@@ -1,3 +1,4 @@
+import { useEmbeddingsReindexProgress } from "@/api/ws";
 import {
   StatusBarMessagesContext,
   StatusMessage,
@@ -41,6 +42,23 @@ export default function Statusbar() {
     });
   }, [potentialProblems, addMessage, clearMessages]);
 
+  const { payload: reindexState } = useEmbeddingsReindexProgress();
+
+  useEffect(() => {
+    if (reindexState) {
+      if (reindexState.status == "indexing") {
+        clearMessages("embeddings-reindex");
+        addMessage(
+          "embeddings-reindex",
+          `Reindexing embeddings (${Math.floor((reindexState.processed_objects / reindexState.total_objects) * 100)}% complete)`,
+        );
+      }
+      if (reindexState.status === "completed") {
+        clearMessages("embeddings-reindex");
+      }
+    }
+  }, [reindexState, addMessage, clearMessages]);
+
   return (
     <div className="absolute bottom-0 left-0 right-0 z-10 flex h-8 w-full items-center justify-between border-t border-secondary-highlight bg-background_alt px-4 dark:text-secondary-foreground">
       <div className="flex h-full items-center gap-2">
diff --git a/web/src/components/overlay/detail/SearchDetailDialog.tsx b/web/src/components/overlay/detail/SearchDetailDialog.tsx
index 94d28c7c8..1cee70aaa 100644
--- a/web/src/components/overlay/detail/SearchDetailDialog.tsx
+++ b/web/src/components/overlay/detail/SearchDetailDialog.tsx
@@ -396,17 +396,19 @@ function ObjectDetailsTab({
             draggable={false}
             src={`${apiHost}api/events/${search.id}/thumbnail.jpg`}
           />
-          <Button
-            onClick={() => {
-              setSearch(undefined);
+          {config?.semantic_search.enabled && (
+            <Button
+              onClick={() => {
+                setSearch(undefined);
 
-              if (setSimilarity) {
-                setSimilarity();
-              }
-            }}
-          >
-            Find Similar
-          </Button>
+                if (setSimilarity) {
+                  setSimilarity();
+                }
+              }}
+            >
+              Find Similar
+            </Button>
+          )}
         </div>
       </div>
       <div className="flex flex-col gap-1.5">
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index e4bb49521..03a60a8d0 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -2,7 +2,6 @@ import {
   useEmbeddingsReindexProgress,
   useEventUpdate,
   useModelState,
-  useWs,
 } from "@/api/ws";
 import ActivityIndicator from "@/components/indicators/activity-indicator";
 import AnimatedCircularProgressBar from "@/components/ui/circular-progress-bar";
@@ -193,22 +192,11 @@ export default function Explore() {
 
   // embeddings reindex progress
 
-  const { send: sendReindexCommand } = useWs(
-    "embeddings_reindex_progress",
-    "embeddingsReindexProgress",
-  );
-
-  useEffect(() => {
-    sendReindexCommand("embeddingsReindexProgress");
-    // only run on mount
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  const { payload: reindexProgress } = useEmbeddingsReindexProgress();
+  const { payload: reindexState } = useEmbeddingsReindexProgress();
 
   const embeddingsReindexing = useMemo(() => {
-    if (reindexProgress) {
-      switch (reindexProgress.status) {
+    if (reindexState) {
+      switch (reindexState.status) {
         case "indexing":
           return true;
         case "completed":
@@ -217,18 +205,10 @@ export default function Explore() {
           return undefined;
       }
     }
-  }, [reindexProgress]);
+  }, [reindexState]);
 
   // model states
 
-  const { send: sendModelCommand } = useWs("model_state", "modelState");
-
-  useEffect(() => {
-    sendModelCommand("modelState");
-    // only run on mount
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   const { payload: textModelState } = useModelState(
     "jinaai/jina-clip-v1-text_model_fp16.onnx",
   );
@@ -274,7 +254,8 @@ export default function Explore() {
 
   if (
     config?.semantic_search.enabled &&
-    (!textModelState ||
+    (!reindexState ||
+      !textModelState ||
       !textTokenizerState ||
       !visionModelState ||
       !visionFeatureExtractorState)
@@ -303,24 +284,22 @@ export default function Explore() {
                 <div className="pt-5 text-center">
                   <AnimatedCircularProgressBar
                     min={0}
-                    max={reindexProgress.total_objects}
-                    value={reindexProgress.processed_objects}
+                    max={reindexState.total_objects}
+                    value={reindexState.processed_objects}
                     gaugePrimaryColor="hsl(var(--selected))"
                     gaugeSecondaryColor="hsl(var(--secondary))"
                   />
                 </div>
                 <div className="flex w-96 flex-col gap-2 py-5">
-                  {reindexProgress.time_remaining !== null && (
+                  {reindexState.time_remaining !== null && (
                     <div className="mb-3 flex flex-col items-center justify-center gap-1">
                       <div className="text-primary-variant">
-                        {reindexProgress.time_remaining === -1
+                        {reindexState.time_remaining === -1
                           ? "Starting up..."
                           : "Estimated time remaining:"}
                       </div>
-                      {reindexProgress.time_remaining >= 0 &&
-                        (formatSecondsToDuration(
-                          reindexProgress.time_remaining,
-                        ) ||
+                      {reindexState.time_remaining >= 0 &&
+                        (formatSecondsToDuration(reindexState.time_remaining) ||
                           "Finishing shortly")}
                     </div>
                   )}
@@ -328,20 +307,20 @@ export default function Explore() {
                     <span className="text-primary-variant">
                       Thumbnails embedded:
                     </span>
-                    {reindexProgress.thumbnails}
+                    {reindexState.thumbnails}
                   </div>
                   <div className="flex flex-row items-center justify-center gap-3">
                     <span className="text-primary-variant">
                       Descriptions embedded:
                     </span>
-                    {reindexProgress.descriptions}
+                    {reindexState.descriptions}
                   </div>
                   <div className="flex flex-row items-center justify-center gap-3">
                     <span className="text-primary-variant">
                       Tracked objects processed:
                     </span>
-                    {reindexProgress.processed_objects} /{" "}
-                    {reindexProgress.total_objects}
+                    {reindexState.processed_objects} /{" "}
+                    {reindexState.total_objects}
                   </div>
                 </div>
               </>
diff --git a/web/src/views/search/SearchView.tsx b/web/src/views/search/SearchView.tsx
index 4c33f7dc8..e64affa36 100644
--- a/web/src/views/search/SearchView.tsx
+++ b/web/src/views/search/SearchView.tsx
@@ -393,7 +393,11 @@ export default function SearchView({
                     >
                       <SearchThumbnail
                         searchResult={value}
-                        findSimilar={() => setSimilaritySearch(value)}
+                        findSimilar={() => {
+                          if (config?.semantic_search.enabled) {
+                            setSimilaritySearch(value);
+                          }
+                        }}
                         onClick={() => onSelectSearch(value, index)}
                       />
                       {(searchTerm ||