diff --git a/src/cuda_gpujoin.cu b/src/cuda_gpujoin.cu
index 7c6c137e6..5ad0286de 100644
--- a/src/cuda_gpujoin.cu
+++ b/src/cuda_gpujoin.cu
@@ -426,7 +426,7 @@ execGpuJoinGiSTJoin(kern_context *kcxt,
 		return depth+1;
 	}
 
-	if (WARP_WRITE_POS(wp,depth) >= WARP_READ_POS(wp,depth) + warpSize)
+	if (WARP_WRITE_POS(wp,depth) >= WARP_READ_POS(wp,depth) + get_local_size())
 	{
 		/*
 		 * Next depth already have warpSize or more pending tuples,