diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index 6fc41300c..ca3447e97 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -137,6 +137,7 @@ export default function App() {
               message={FETCH_ERROR_MESSAGE}
               openModal={
                 isErrorHealth ||
+                !healthData ||
                 (healthData &&
                   Object.values(healthData).some((value) => value !== "ok"))
               }
diff --git a/src/frontend/src/controllers/API/queries/health/use-get-health.ts b/src/frontend/src/controllers/API/queries/health/use-get-health.ts
index c0250a799..95ec34f9e 100644
--- a/src/frontend/src/controllers/API/queries/health/use-get-health.ts
+++ b/src/frontend/src/controllers/API/queries/health/use-get-health.ts
@@ -30,6 +30,7 @@ export const useGetHealthQuery: useQueryFunctionType<
   const queryResult = query(["useGetHealthQuery"], getHealthFn, {
     placeholderData: keepPreviousData,
     refetchInterval: 20000,
+    retry: false,
     ...options,
   });