diff --git a/src/panfrost/lib/pan_props.h b/src/panfrost/lib/pan_props.h
index 6351c37efc2..289a24ce20c 100644
--- a/src/panfrost/lib/pan_props.h
+++ b/src/panfrost/lib/pan_props.h
@@ -189,12 +189,15 @@ static inline unsigned
 pan_get_max_msaa(unsigned arch, unsigned max_tib_size, unsigned max_cbuf_atts,
                  unsigned format_size)
 {
+   if (arch < 5)
+      return 8;
+
    assert(max_cbuf_atts > 0);
    assert(format_size > 0);
-   const unsigned min_tile_size = arch >= 5 ? 4 * 4 : 16 * 16;
+   const unsigned min_tile_size = 4 * 4;
    unsigned max_msaa = max_tib_size / (max_cbuf_atts * format_size *
                                        min_tile_size);
-   return MIN2(max_msaa, arch >= 5 ? 16 : 8);
+   return MIN2(max_msaa, 16);
 }
 
 #endif