diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 1f45eacde..108117959 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -111,19 +111,23 @@ class DashboardController extends ActionController
      */
     public function indexAction()
     {
-        $dashboard = $this->getDashboard();
-        if ($this->_getParam('pane')) {
-            $pane = $this->_getParam('pane');
-            $dashboard->activate($pane);
-        }
+        $dashboard = Dashboard::load();
 
-        $this->view->configPath = IcingaConfig::resolvePath(self::DEFAULT_CONFIG);
-
-        if ($dashboard === null) {
+        if (! $dashboard->hasPanes()) {
             $this->view->title = 'Dashboard';
         } else {
-            $this->view->title = $dashboard->getActivePane()->getTitle() . ' :: Dashboard';
-            $this->view->tabs = $dashboard->getTabs();
+            if ($this->_getParam('pane')) {
+                $pane = $this->_getParam('pane');
+                $dashboard->activate($pane);
+            }
+
+            $this->view->configPath = IcingaConfig::resolvePath(self::DEFAULT_CONFIG);
+
+            if ($dashboard === null) {
+                $this->view->title = 'Dashboard';
+            } else {
+                $this->view->title = $dashboard->getActivePane()->getTitle() . ' :: Dashboard';
+                $this->view->tabs = $dashboard->getTabs();
 
                 /* Temporarily removed
                 $this->view->tabs->add(
@@ -135,8 +139,8 @@ class DashboardController extends ActionController
                 );
                 */
 
-            $this->view->dashboard = $dashboard;
-
+                $this->view->dashboard = $dashboard;
+            }
         }
     }