diff --git a/libraries/classes/Partitioning/Partition.php b/libraries/classes/Partitioning/Partition.php
index 21c0bf1c91..4d05bc2c7d 100644
--- a/libraries/classes/Partitioning/Partition.php
+++ b/libraries/classes/Partitioning/Partition.php
@@ -156,20 +156,18 @@ class Partition extends SubPartition
                 $partitionMap = [];
                 /** @var array $row */
                 foreach ($result as $row) {
-                    if (isset($partitionMap[$row['PARTITION_NAME']])) {
-                        $partition = $partitionMap[$row['PARTITION_NAME']];
-                    } else {
-                        $partition = new Partition($row);
-                        $partitionMap[$row['PARTITION_NAME']] = $partition;
+                    if (empty($row['PARTITION_NAME'])) {
+                        continue;
                     }
 
+                    $partition = $partitionMap[$row['PARTITION_NAME']] ?? new Partition($row);
+                    $partitionMap[$row['PARTITION_NAME']] = $partition;
+
                     if (empty($row['SUBPARTITION_NAME'])) {
                         continue;
                     }
 
-                    $parentPartition = $partition;
-                    $partition = new SubPartition($row);
-                    $parentPartition->addSubPartition($partition);
+                    $partition->addSubPartition(new SubPartition($row));
                 }
 
                 return array_values($partitionMap);
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index ec19fe65cd..09df975a1f 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -24432,7 +24432,7 @@ parameters:
 
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 7
+			count: 8
 			path: libraries/classes/Partitioning/Partition.php
 
 		-