diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index ef8feb83f6..a45c7490af 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -12,6 +12,7 @@ x-server-build: &server-common
     context: ../
     dockerfile: server/Dockerfile
     target: dev
+  restart: always
   volumes:
     - ../server:/usr/src/app
     - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
diff --git a/server/src/domain/domain.module.ts b/server/src/domain/domain.module.ts
index 4cd4b77dbf..ff666d89a2 100644
--- a/server/src/domain/domain.module.ts
+++ b/server/src/domain/domain.module.ts
@@ -49,8 +49,9 @@ const providers: Provider[] = [
   ImmichLogger,
   {
     provide: INITIAL_SYSTEM_CONFIG,
-    inject: [SystemConfigService],
-    useFactory: async (configService: SystemConfigService) => {
+    inject: [SystemConfigService, DatabaseService],
+    useFactory: async (configService: SystemConfigService, databaseService: DatabaseService) => {
+      await databaseService.init();
       return configService.getConfig();
     },
   },