diff --git a/lib/Doctrine/DBAL/Query/QueryBuilder.php b/lib/Doctrine/DBAL/Query/QueryBuilder.php
index 587e26656a..3ad7ebdc3c 100644
--- a/lib/Doctrine/DBAL/Query/QueryBuilder.php
+++ b/lib/Doctrine/DBAL/Query/QueryBuilder.php
@@ -1327,9 +1327,11 @@ private function getSQLForJoins($fromAlias, array &$knownAliases)
                 if (array_key_exists($join['joinAlias'], $knownAliases)) {
                     throw QueryException::nonUniqueAlias($join['joinAlias'], array_keys($knownAliases));
                 }
-                $sql                             .= ' ' . strtoupper($join['joinType'])
-                    . ' JOIN ' . $join['joinTable'] . ' ' . $join['joinAlias']
-                    . ' ON ' . ((string) $join['joinCondition']);
+                $sql .= ' ' . strtoupper($join['joinType'])
+                    . ' JOIN ' . $join['joinTable'] . ' ' . $join['joinAlias'];
+                if ($join['joinCondition'] !== null) {
+                    $sql .= ' ON ' . $join['joinCondition'];
+                }
                 $knownAliases[$join['joinAlias']] = true;
             }
 
diff --git a/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php b/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php
index a210ef2fe7..7ec96334a2 100644
--- a/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php
+++ b/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php
@@ -92,11 +92,22 @@ public function testSelectWithJoin() : void
 
         $qb->select('u.*', 'p.*')
            ->from('users', 'u')
-           ->Join('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id'));
+           ->join('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id'));
 
         self::assertEquals('SELECT u.*, p.* FROM users u INNER JOIN phones p ON p.user_id = u.id', (string) $qb);
     }
 
+    public function testSelectWithJoinNoCondition() : void
+    {
+        $qb = new QueryBuilder($this->conn);
+
+        $qb->select('u.*', 'p.*')
+            ->from('users', 'u')
+            ->join('u', 'phones', 'p');
+
+        self::assertEquals('SELECT u.*, p.* FROM users u INNER JOIN phones p', (string) $qb);
+    }
+
     public function testSelectWithInnerJoin() : void
     {
         $qb   = new QueryBuilder($this->conn);
@@ -115,8 +126,8 @@ public function testSelectWithRightJoin() : void
         $expr = $qb->expr();
 
         $qb->select('u.*', 'p.*')
-           ->from('users', 'u')
-           ->rightJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id'));
+            ->from('users', 'u')
+            ->rightJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id'));
 
         self::assertEquals('SELECT u.*, p.* FROM users u RIGHT JOIN phones p ON p.user_id = u.id', (string) $qb);
     }