diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c
index 670c9b19e33..1a30997049d 100644
--- a/src/asahi/compiler/agx_compile.c
+++ b/src/asahi/compiler/agx_compile.c
@@ -1143,6 +1143,9 @@ agx_emit_image_store(agx_builder *b, nir_intrinsic_instr *instr)
       data = agx_emit_collect(b, 4, chan);
    }
 
+   /* Image stores act like tilebuffer stores when used for tib spilling */
+   b->shader->out->tag_write_disable = false;
+
    return agx_image_write(b, data, coords, lod, base, index, dim);
 }
 
diff --git a/src/asahi/lib/agx_nir_lower_tilebuffer.c b/src/asahi/lib/agx_nir_lower_tilebuffer.c
index 7d6e871f62c..2737d3ebabd 100644
--- a/src/asahi/lib/agx_nir_lower_tilebuffer.c
+++ b/src/asahi/lib/agx_nir_lower_tilebuffer.c
@@ -195,8 +195,6 @@ store_memory(nir_builder *b, unsigned bindless_base, unsigned nr_samples,
 
    if (nr_samples > 1)
       nir_pop_if(b, NULL);
-
-   b->shader->info.writes_memory = true;
 }
 
 static nir_def *