diff --git a/lyra2/cuda_lyra2v2.cu b/lyra2/cuda_lyra2v2.cu
index a1e5dc0..c6c4d1a 100644
--- a/lyra2/cuda_lyra2v2.cu
+++ b/lyra2/cuda_lyra2v2.cu
@@ -362,7 +362,8 @@ void lyra2v2_cpu_hash_32(int thr_id, uint32_t threads, uint32_t startNounce, uin
 	int dev_id = device_map[thr_id % MAX_GPUS];
 	uint32_t tpb = TPB52;
 
-	if (cuda_arch[dev_id] == 500) tpb = TPB50;
+	if (cuda_arch[dev_id] > 500) tpb = TPB52;
+	else if (cuda_arch[dev_id] == 500) tpb = TPB50;
 	else if (cuda_arch[dev_id] >= 350) tpb = TPB35;
 	else if (cuda_arch[dev_id] >= 300) tpb = TPB30;
 	else if (cuda_arch[dev_id] >= 200) tpb = TPB20;