diff --git a/lib/Features/FeatureFlagsController.php b/lib/Features/FeatureFlagsController.php
index c156f71d97..cb0876be18 100644
--- a/lib/Features/FeatureFlagsController.php
+++ b/lib/Features/FeatureFlagsController.php
@@ -36,6 +36,9 @@ class FeatureFlagsController {
       ),
       $flags
     );
+    if ($flagsMap === false) {
+      $flagsMap = [];
+    }
 
     $output = [];
     foreach ($this->featuresController->getDefaults() as $name => $default) {