diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/bvh_params.h
index f7bc79f71e6..ad36bdfa326 100644
--- a/intern/cycles/bvh/bvh_params.h
+++ b/intern/cycles/bvh/bvh_params.h
@@ -66,7 +66,7 @@ public:
 		sah_triangle_cost = 1.0f;
 
 		min_leaf_size = 1;
-		max_leaf_size = 0x7FFFFFF;
+		max_leaf_size = 8;
 
 		top_level = false;
 		use_cache = false;