diff --git a/rpcs3/Emu/RSX/rsx_methods.h b/rpcs3/Emu/RSX/rsx_methods.h
index c0132eb082..b1ad10ea0e 100644
--- a/rpcs3/Emu/RSX/rsx_methods.h
+++ b/rpcs3/Emu/RSX/rsx_methods.h
@@ -692,8 +692,14 @@ namespace rsx
 				return false;
 
 			}
-			
-			return restart_index() <= (index_type() == rsx::index_array_type::u16 ? 0xffff : 0xfffff);
+
+			if (index_type() == rsx::index_array_type::u16 &&
+				restart_index() > 0xffff)
+			{
+				return false;
+			}
+
+			return true;
 		}
 
 		u32 z_clear_value(bool is_depth_stencil) const