diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index d54fe06..d49269b 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -2498,8 +2498,9 @@ function menu_cache_clear_all() {
  * Resets the menu system static cache.
  */
 function menu_reset_static_cache() {
-  \Drupal::entityManager()
-    ->getStorageController('menu_link')->resetCache();
+  if (\Drupal::moduleHandler()->moduleExists('menu_links')) {
+    \Drupal::entityManager()->getStorageController('menu_link')->resetCache();
+  }
   drupal_static_reset('_menu_build_tree');
   drupal_static_reset('menu_tree');
   drupal_static_reset('menu_tree_all_data');
@@ -2819,7 +2820,10 @@ function _menu_clear_page_cache() {
  * Updates a list of menus with expanded items.
  */
 function _menu_set_expanded_menus() {
-  $names = db_query("SELECT menu_name FROM {menu_links} WHERE expanded <> 0 GROUP BY menu_name")->fetchCol();
+  $names = array();
+  if (\Drupal::moduleHandler()->moduleExists('menu_links')) {
+    $names = db_query("SELECT menu_name FROM {menu_links} WHERE expanded <> 0 GROUP BY menu_name")->fetchCol();
+  }
   \Drupal::state()->set('menu_expanded', $names);
 }