diff --git a/core/modules/views/src/Plugin/views/field/EntityField.php b/core/modules/views/src/Plugin/views/field/EntityField.php
index 95d1ebde90..9c0233cfe6 100644
--- a/core/modules/views/src/Plugin/views/field/EntityField.php
+++ b/core/modules/views/src/Plugin/views/field/EntityField.php
@@ -323,7 +323,12 @@ public function clickSort($order) {
       // Column is not in query; add a sort on it (without adding the column).
       $this->aliases[$column] = $this->tableAlias . '.' . $column;
     }
-    $this->query->addOrderBy(NULL, NULL, $order, $this->aliases[$column]);
+    if (!empty($this->query->options) && $this->query->options['distinct']) {
+      $this->query->addOrderBy($this->tableAlias, $column, $order, $this->aliases[$column]);
+    }
+    else {
+      $this->query->addOrderBy(NULL, NULL, $order, $this->aliases[$column]);
+    }
   }
 
   /**