diff --git a/include/features.php b/include/features.php
index f2a81fc6e..4e9e7d9d9 100644
--- a/include/features.php
+++ b/include/features.php
@@ -16,10 +16,14 @@ use Friendica\Core\PConfig;
 function feature_enabled($uid, $feature) {
 	$x = Config::get('feature_lock', $feature, false);
 
+	if ($x === false) {
+		$x = PConfig::get($uid, 'feature', $feature, false);
+	}
+	if ($x === false) {
+		$x = Config::get('feature', $feature, false);
+	}
 	if ($x === false) {
 		$x = get_feature_default($feature);
-		$x = Config::get('feature', $feature, $x);
-		$x = PConfig::get($uid, 'feature', $feature, $x);
 	}
 
 	$arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);