diff --git a/src/microsoft/compiler/nir_to_dxil.c b/src/microsoft/compiler/nir_to_dxil.c
index ce2f3fa3d92..4d5a809878d 100644
--- a/src/microsoft/compiler/nir_to_dxil.c
+++ b/src/microsoft/compiler/nir_to_dxil.c
@@ -4056,12 +4056,8 @@ emit_image_load(struct ntd_context *ctx, nir_intrinsic_instr *intr)
       store_dest(ctx, &intr->dest, i, component, out_type);
    }
 
-   /* FIXME: This flag should be set to true when the RWTexture is attached
-    * a vector, and we always declare a vec4 right now, so it should always be
-    * true. Might be worth reworking the dxil_module_get_res_type() to use a
-    * scalar when the image only has one component.
-    */
-   ctx->mod.feats.typed_uav_load_additional_formats = true;
+   if (num_components > 1)
+      ctx->mod.feats.typed_uav_load_additional_formats = true;
 
    return true;
 }