diff --git a/core/modules/entity/lib/Drupal/entity/EntityFieldQuery.php b/core/modules/entity/lib/Drupal/entity/EntityFieldQuery.php
index 03a2305..9c1db74 100644
--- a/core/modules/entity/lib/Drupal/entity/EntityFieldQuery.php
+++ b/core/modules/entity/lib/Drupal/entity/EntityFieldQuery.php
@@ -896,8 +896,7 @@ class EntityFieldQuery {
       }
       elseif ($order['type'] == 'property') {
         $specifier = $order['specifier'];
-        $table = isset($data_table_schema['fields'][$specifier]) ? $data_table : $base_table;
-        $select_query->orderBy("$table.$specifier", $order['direction']);
+        $select_query->orderBy("$property_table.$specifier", $order['direction']);
       }
     }