diff --git a/client/src/Features/Settings/settingsSlice.js b/client/src/Features/Settings/settingsSlice.js
index 51f85a2b5..35e17e360 100644
--- a/client/src/Features/Settings/settingsSlice.js
+++ b/client/src/Features/Settings/settingsSlice.js
@@ -6,6 +6,7 @@ const initialState = {
 	apiBaseUrl: "",
 	logLevel: "debug",
 	language: "",
+	pagespeedApiKey: "",
 };
 
 export const getAppSettings = createAsyncThunk(
@@ -57,6 +58,7 @@ const handleGetSettingsFulfilled = (state, action) => {
 	state.apiBaseUrl = action.payload.data.apiBaseUrl;
 	state.logLevel = action.payload.data.logLevel;
 	state.language = action.payload.data.language;
+	state.pagespeedApiKey = action.payload.data.pagespeedApiKey;
 };
 const handleGetSettingsRejected = (state, action) => {
 	state.isLoading = false;
diff --git a/server/service/settingsService.js b/server/service/settingsService.js
index 7a219a89d..1443755f9 100755
--- a/server/service/settingsService.js
+++ b/server/service/settingsService.js
@@ -48,14 +48,11 @@ class SettingsService {
 
 			// If there are any settings that weren't set by environment variables, use user settings from DB
 			for (const key in envConfig) {
-
-				const envValue = envConfig[key];
-				const dbValue = dbSettings?.[key];
-
-				if (envValue === undefined || envValue === "") {
-					if (dbValue !== undefined) {
-						this.settings[key] = dbValue;
-					}
+				if (
+					typeof envConfig?.[key] === "undefined" &&
+					typeof dbSettings?.[key] !== "undefined"
+				) {
+					this.settings[key] = dbSettings[key];
 				}
 			}