1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/ApiManagers/DiagnosticManager.ts b/src/server/ApiManagers/DiagnosticManager.ts
index b775167b6..104985481 100644
--- a/src/server/ApiManagers/DiagnosticManager.ts
+++ b/src/server/ApiManagers/DiagnosticManager.ts
@@ -16,8 +16,12 @@ export default class DiagnosticManager extends ApiManager {
             method: Method.GET,
             subscription: "/solrHeartbeat",
             onValidation: async ({ res }) => {
-                const response = await request("http://localhost:8983");
-                res.send(response !== undefined);
+                try {
+                    await request("http://localhost:8983");
+                    res.send({ running: true });
+                } catch (e) {
+                    res.send({ running: false });
+                }
             }
         });