diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 9c1ad7d7b45..76a93be20d2 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -1177,10 +1177,8 @@ ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable)
 					 * array.
 					 */
 					dtuples = (old_batch0->ntuples * 2.0) / new_nbatch;
-					dbuckets = ceil(dtuples / NTUP_PER_BUCKET);
-					dbuckets = Min(dbuckets, max_buckets);
-					new_nbuckets = (int) dbuckets;
-					new_nbuckets = Max(new_nbuckets, 1024);
+					dbuckets = Min(ceil(dtuples / NTUP_PER_BUCKET), max_buckets);
+					new_nbuckets = Max((int) dbuckets, 1024);
 					new_nbuckets = pg_nextpower2_32(new_nbuckets);
 					dsa_free(hashtable->area, old_batch0->buckets);
 					hashtable->batches[0].shared->buckets =