diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index f2099053730..5b45bba18f0 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -1912,9 +1912,19 @@ iris_resource_get_handle(struct pipe_screen *pscreen,
    }

    whandle->format = res->external_format;
-   whandle->modifier =
-      res->mod_info ? res->mod_info->modifier
-                    : tiling_to_modifier(isl_tiling_to_i915_tiling(res->surf.tiling));
+
+   if (res->mod_info) {
+      whandle->modifier = res->mod_info->modifier;
+   } else {
+      whandle->modifier = DRM_FORMAT_MOD_INVALID;
+      isl_drm_modifier_info_for_each(isl_mod_info) {
+         if ((isl_mod_info->tiling == res->surf.tiling) &&
+             (isl_mod_info->aux_usage == res->aux.usage) &&
+             (isl_mod_info->supports_clear_color == (res->aux.clear_color_bo != NULL))) {
+            whandle->modifier = isl_mod_info->modifier;
+         }
+      }
+   }

 #ifndef NDEBUG
    enum isl_aux_usage allowed_usage =