diff --git a/.pick_status.json b/.pick_status.json
index 85c207b6086..3728d808798 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -124,7 +124,7 @@
         "description": "mesa/st: do not check single-sampled for max_samples",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f56443ac84bc1a46865debe76ccb82a37d042005",
         "notes": null
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 7430bfda1f4..6233221acb7 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -705,9 +705,10 @@ get_max_samples_for_formats(struct pipe_screen *screen,
                             unsigned bind)
 {
    unsigned i, f, supported_samples = 0;
+   unsigned min_samples = screen->caps.fake_sw_msaa ? 1 : 2;
 
    for (f = 0; f < num_formats; f++) {
-      for (i = max_samples; i > 0; --i) {
+      for (i = max_samples; i >= min_samples; --i) {
          if (screen->is_format_supported(screen, formats[f],
                                          PIPE_TEXTURE_2D, i, i, bind)) {
             /* update both return value and loop-boundary */
@@ -728,8 +729,9 @@ get_max_samples_for_formats_advanced(struct pipe_screen *screen,
                                      unsigned bind)
 {
    unsigned i, f;
+   unsigned min_samples = screen->caps.fake_sw_msaa ? 1 : 2;
 
-   for (i = max_samples; i > 0; --i) {
+   for (i = max_samples; i >= min_samples; --i) {
       for (f = 0; f < num_formats; f++) {
          if (screen->is_format_supported(screen, formats[f], PIPE_TEXTURE_2D,
                                          i, num_storage_samples, bind)) {