diff --git a/src/Core/Config/JITPConfigAdapter.php b/src/Core/Config/JITPConfigAdapter.php
index 4992068f60..ac9a56076c 100644
--- a/src/Core/Config/JITPConfigAdapter.php
+++ b/src/Core/Config/JITPConfigAdapter.php
@@ -28,7 +28,7 @@ class JITPConfigAdapter implements IPConfigAdapter
 			}
 		} else if ($cat != 'config') {
 			// Negative caching
-			PConfig::setPConfigValue($uid, $cat, "!<unset>!");
+			PConfig::setPConfigValue($uid, $cat, null, "!<unset>!");
 		}
 		DBA::close($pconfigs);
 	}
diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 7104ce83dc..75403aaebe 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -203,7 +203,11 @@ class PConfig extends BaseObject
 			self::$config[$uid][$cat] = [];
 		}
 
-		self::$config[$uid][$cat][$k] = $value;
+		if ($k === null) {
+			self::$config[$uid][$cat] = $value;
+		} else {
+			self::$config[$uid][$cat][$k] = $value;
+		}
 	}
 
 	/**