diff --git a/docker-compose.yaml b/docker-compose.yaml
index f3b09a0..d13e10c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,6 +8,7 @@ services:
       - 4000:8080
     networks:
       - perplexica-network
+    restart: unless-stopped
 
   perplexica-backend:
     build:
@@ -32,6 +33,7 @@ services:
       - 3001:3001
     networks:
       - perplexica-network
+    restart: unless-stopped
 
   perplexica-frontend:
     build:
@@ -47,6 +49,7 @@ services:
       - 3000:3000
     networks:
       - perplexica-network
+    restart: unless-stopped
 
 networks:
   perplexica-network:
diff --git a/src/routes/images.ts b/src/routes/images.ts
index d8ad8e1..6bd43d3 100644
--- a/src/routes/images.ts
+++ b/src/routes/images.ts
@@ -20,8 +20,8 @@ router.post('/', async (req, res) => {
     });
 
     const chatModels = await getAvailableChatModelProviders();
-    const provider = chat_model_provider || Object.keys(chatModels)[0];
-    const chatModel = chat_model || Object.keys(chatModels[provider])[0];
+    const provider = chat_model_provider ?? Object.keys(chatModels)[0];
+    const chatModel = chat_model ?? Object.keys(chatModels[provider])[0];
 
     let llm: BaseChatModel | undefined;
 
diff --git a/src/routes/suggestions.ts b/src/routes/suggestions.ts
index 10e5715..b15ff5f 100644
--- a/src/routes/suggestions.ts
+++ b/src/routes/suggestions.ts
@@ -20,8 +20,8 @@ router.post('/', async (req, res) => {
     });
 
     const chatModels = await getAvailableChatModelProviders();
-    const provider = chat_model_provider || Object.keys(chatModels)[0];
-    const chatModel = chat_model || Object.keys(chatModels[provider])[0];
+    const provider = chat_model_provider ?? Object.keys(chatModels)[0];
+    const chatModel = chat_model ?? Object.keys(chatModels[provider])[0];
 
     let llm: BaseChatModel | undefined;
 
diff --git a/src/routes/videos.ts b/src/routes/videos.ts
index e117a5a..0ffdb2c 100644
--- a/src/routes/videos.ts
+++ b/src/routes/videos.ts
@@ -20,8 +20,8 @@ router.post('/', async (req, res) => {
     });
 
     const chatModels = await getAvailableChatModelProviders();
-    const provider = chat_model_provider || Object.keys(chatModels)[0];
-    const chatModel = chat_model || Object.keys(chatModels[provider])[0];
+    const provider = chat_model_provider ?? Object.keys(chatModels)[0];
+    const chatModel = chat_model ?? Object.keys(chatModels[provider])[0];
 
     let llm: BaseChatModel | undefined;