diff --git a/server/service/settingsService.js b/server/service/settingsService.js
index 1443755f9..7a219a89d 100755
--- a/server/service/settingsService.js
+++ b/server/service/settingsService.js
@@ -48,11 +48,14 @@ class SettingsService {
 
 			// If there are any settings that weren't set by environment variables, use user settings from DB
 			for (const key in envConfig) {
-				if (
-					typeof envConfig?.[key] === "undefined" &&
-					typeof dbSettings?.[key] !== "undefined"
-				) {
-					this.settings[key] = dbSettings[key];
+
+				const envValue = envConfig[key];
+				const dbValue = dbSettings?.[key];
+
+				if (envValue === undefined || envValue === "") {
+					if (dbValue !== undefined) {
+						this.settings[key] = dbValue;
+					}
 				}
 			}