diff --git a/src/Kunstmaan/AdminBundle/Toolbar/BundleVersionDataCollector.php b/src/Kunstmaan/AdminBundle/Toolbar/BundleVersionDataCollector.php
index 33d151aa5c..de5b5bca4f 100644
--- a/src/Kunstmaan/AdminBundle/Toolbar/BundleVersionDataCollector.php
+++ b/src/Kunstmaan/AdminBundle/Toolbar/BundleVersionDataCollector.php
@@ -46,7 +46,7 @@ public function collectData()
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
         if (!$this->isEnabled()) {
-            $this->data = false;
+            $this->data = [];
         } else {
             $this->data = $this->collectData();
         }
@@ -71,4 +71,4 @@ public function isEnabled()
     {
         return $this->versionChecker->isEnabled();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Kunstmaan/NodeBundle/Toolbar/NodeDataCollector.php b/src/Kunstmaan/NodeBundle/Toolbar/NodeDataCollector.php
index 5363cadb39..066a3ae561 100644
--- a/src/Kunstmaan/NodeBundle/Toolbar/NodeDataCollector.php
+++ b/src/Kunstmaan/NodeBundle/Toolbar/NodeDataCollector.php
@@ -60,7 +60,7 @@ public function collectData()
             return ['data' => $data];
         }
 
-        return null;
+        return [];
     }
 
     /**