diff --git a/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php b/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
index 7db28fc..c7da7f7 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
@@ -164,16 +164,16 @@ protected function invokeHook($hook, EntityInterface $entity) {
   protected function postLoad(array &$queried_entities) {
     $entity_class = $this->entityInfo->getClass();
     $entity_class::postLoad($this, $queried_entities);
-    // Call hook_entity_load().
-    foreach ($this->moduleHandler()->getImplementations('entity_load') as $module) {
-      $function = $module . '_entity_load';
-      $function($queried_entities, $this->entityType);
-    }
     // Call hook_TYPE_load().
     foreach ($this->moduleHandler()->getImplementations($this->entityType . '_load') as $module) {
       $function = $module . '_' . $this->entityType . '_load';
       $function($queried_entities);
     }
+    // Call hook_entity_load().
+    foreach ($this->moduleHandler()->getImplementations('entity_load') as $module) {
+      $function = $module . '_entity_load';
+      $function($queried_entities, $this->entityType);
+    }
   }
 
   /**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
index 784b0ac..23cc85a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
@@ -101,8 +101,8 @@ public function testBlockHooks() {
     $entity = entity_load('block', $entity->id());
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type block',
       'entity_crud_hook_test_block_load called',
+      'entity_crud_hook_test_entity_load called for type block',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -183,8 +183,8 @@ public function testCommentHooks() {
     $comment = comment_load($comment->id());
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type comment',
       'entity_crud_hook_test_comment_load called',
+      'entity_crud_hook_test_entity_load called for type comment',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -247,8 +247,8 @@ public function testFileHooks() {
     $file = file_load($file->id());
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type file',
       'entity_crud_hook_test_file_load called',
+      'entity_crud_hook_test_entity_load called for type file',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -310,8 +310,8 @@ public function testNodeHooks() {
     $node = node_load($node->id());
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type node',
       'entity_crud_hook_test_node_load called',
+      'entity_crud_hook_test_entity_load called for type node',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -379,8 +379,8 @@ public function testTaxonomyTermHooks() {
     $term = entity_load('taxonomy_term', $term->id());
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type taxonomy_term',
       'entity_crud_hook_test_taxonomy_term_load called',
+      'entity_crud_hook_test_entity_load called for type taxonomy_term',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -438,8 +438,8 @@ public function testTaxonomyVocabularyHooks() {
     $vocabulary = entity_load('taxonomy_vocabulary', $vocabulary->id());
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type taxonomy_vocabulary',
       'entity_crud_hook_test_taxonomy_vocabulary_load called',
+      'entity_crud_hook_test_entity_load called for type taxonomy_vocabulary',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();
@@ -495,8 +495,8 @@ public function testUserHooks() {
     user_load($account->id());
 
     $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type user',
       'entity_crud_hook_test_user_load called',
+      'entity_crud_hook_test_entity_load called for type user',
     ));
 
     $_SESSION['entity_crud_hook_test'] = array();