diff --git a/pkg/gateway/gateway.go b/pkg/gateway/gateway.go
index c35b3e744..82dceb83f 100644
--- a/pkg/gateway/gateway.go
+++ b/pkg/gateway/gateway.go
@@ -480,14 +480,17 @@ func restartServices(
 	}
 	fmt.Println("  ✓ Heartbeat service restarted")
 
-	runningServices.MediaStore = media.NewFileMediaStoreWithCleanup(media.MediaCleanerConfig{
-		Enabled:  cfg.Tools.MediaCleanup.Enabled,
-		MaxAge:   time.Duration(cfg.Tools.MediaCleanup.MaxAge) * time.Minute,
-		Interval: time.Duration(cfg.Tools.MediaCleanup.Interval) * time.Minute,
-	})
-	if fms, ok := runningServices.MediaStore.(*media.FileMediaStore); ok {
-		fms.Start()
-	}
+
+	if runningServices.MediaStore == nil {
+    runningServices.MediaStore = media.NewFileMediaStoreWithCleanup(media.MediaCleanerConfig{
+        Enabled:  cfg.Tools.MediaCleanup.Enabled,
+        MaxAge:   time.Duration(cfg.Tools.MediaCleanup.MaxAge) * time.Minute,
+        Interval: time.Duration(cfg.Tools.MediaCleanup.Interval) * time.Minute,
+    })
+    if fms, ok := runningServices.MediaStore.(*media.FileMediaStore); ok {
+        fms.Start()
+    }
+}
 	al.SetMediaStore(runningServices.MediaStore)
 
 	al.SetChannelManager(runningServices.ChannelManager)