diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index 5b03e386..aa2cb9db 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -984,7 +984,7 @@ class Settings(object):
 		if not force and key in defaults and key in config and defaults[key] == value:
 			del config[key]
 			self._dirty = True
-		elif force or (not key in config and defaults[key] != value) or (key in config and config[key] != value):
+		elif force or (not key in config and key in defaults and defaults[key] != value) or (key in config and config[key] != value):
 			if value is None and key in config:
 				del config[key]
 			else: