diff --git a/src/settings.js b/src/settings.js
index 65fe24322a..87508b1dcb 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -5,6 +5,9 @@ const pubsub = require('./pubsub');
 
 function expandObjBy(obj1, obj2) {
 	let changed = false;
+	if (!obj1 || !obj2) {
+		return changed;
+	}
 	for (const [key, val2] of Object.entries(obj2)) {
 		const val1 = obj1[key];
 		const xorIsArray = Array.isArray(val1) !== Array.isArray(val2);