diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index df4537a2..df2b53a1 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -419,7 +419,7 @@ class HierarchicalChainMap(ChainMap):
 	def _hierarchy_for_key(cls, key, chain):
 		wrapped_mappings = list()
 		for mapping in chain.maps:
-			if key in mapping:
+			if key in mapping and mapping[key] is not None:
 				wrapped_mappings.append(mapping[key])
 			else:
 				wrapped_mappings.append(dict())