diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 6492b10..ad7afbf 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -2219,11 +2219,12 @@ function menu_tab_root_path() {
  * Returns a renderable element for the primary and secondary tabs.
  */
 function menu_local_tabs() {
-  return array(
-    '#theme' => 'menu_local_tasks',
-    '#primary' => menu_primary_local_tasks(),
-    '#secondary' => menu_secondary_local_tasks(),
-  );
+ $tabs = array(
+        '#theme' => 'menu_local_tasks',
+        '#primary' => menu_primary_local_tasks(),
+        '#secondary' => menu_secondary_local_tasks(),
+    );
+    return (!empty($tabs['#primary']) && !empty($tabs['#secondary']) ? $tabs : array());
 }
 
 /**
diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php
index b92d064..4921748 100644
--- a/core/themes/seven/template.php
+++ b/core/themes/seven/template.php
@@ -34,7 +34,7 @@ function seven_preprocess_page(&$vars) {
   unset($vars['primary_local_tasks']['#secondary']);
   $vars['secondary_local_tasks'] = array(
     '#theme' => 'menu_local_tasks',
-    '#secondary' => $vars['tabs']['#secondary'],
+    '#secondary' => isset($vars['tabs']['#secondary']) ? $vars['tabs']['#secondary'] : '',
   );
 }