diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
index b21ce3a5c..94ce6c59d 100644
--- a/src/Database/Table/SqlBuilder.php
+++ b/src/Database/Table/SqlBuilder.php
@@ -572,8 +572,9 @@ protected function getSortedJoins($table, & $leftJoinDependency, & $tableJoins,
 				}
 			}
 			$finalJoins += $tableJoins[$table];
-			$this->parameters['joinConditionSorted'] += isset($this->parameters['joinCondition'][$this->reservedTableNames[$table]])
-				? [$table => $this->parameters['joinCondition'][$this->reservedTableNames[$table]]]
+			$key = isset($this->aliases[$table]) ? $table : $this->reservedTableNames[$table];
+			$this->parameters['joinConditionSorted'] += isset($this->parameters['joinCondition'][$key])
+				? [$table => $this->parameters['joinCondition'][$key]]
 				: [];
 			unset($tableJoins[$table]);
 			unset($this->expandingJoins[$table]);