diff --git a/docker-compose.yml b/docker-compose.yml
index b342253..9da7a3e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,10 @@ services:
       - data-volume:"8000:8000"
     privileged: true
     ipc: host
+    deploy:
+      restart_policy:
+        condition: on-failure
+        
   analytics:
     build:
       dockerfile: Dockerfile_analytics
@@ -18,6 +22,9 @@ services:
       - "8002:8002"
     privileged: true
     ipc: host
+    deploy:
+      restart_policy:
+        condition: on-failure
 
 volumes:
   data-volume:
diff --git a/server/src/services/analytics_service.ts b/server/src/services/analytics_service.ts
index c6097c9..94413b2 100644
--- a/server/src/services/analytics_service.ts
+++ b/server/src/services/analytics_service.ts
@@ -165,7 +165,7 @@ export class AnalyticsService {
 
   private async _onAnalyticsDown() {
     console.log('Analytics is down');
-    if(process.env.NODE_ENV !== 'development') {
+    if(process.env.NODE_ENV !== 'development' && process.env.INSIDE_DOCKER !== 'true') {
       await AnalyticsService._runAnalyticsProcess(this._zmqConnectionString);
     }
   }