diff --git a/src/asahi/lib/agx_bo.c b/src/asahi/lib/agx_bo.c
index f23a7c90470..534280de2b4 100644
--- a/src/asahi/lib/agx_bo.c
+++ b/src/asahi/lib/agx_bo.c
@@ -388,8 +388,10 @@ agx_bo_create(struct agx_device *dev, size_t size, unsigned align,
    bo->label = label;
    p_atomic_set(&bo->refcnt, 1);
 
-   if (dev->debug & AGX_DBG_TRACE)
+   if (dev->debug & AGX_DBG_TRACE) {
+      agx_bo_map(bo);
       agxdecode_track_alloc(dev->agxdecode, bo);
+   }
 
    agx_bo_dump_all_periodic(dev);
    return bo;
diff --git a/src/asahi/lib/agx_device.c b/src/asahi/lib/agx_device.c
index 9704b982a7d..eccb5503994 100644
--- a/src/asahi/lib/agx_device.c
+++ b/src/asahi/lib/agx_device.c
@@ -296,8 +296,10 @@ agx_bo_import(struct agx_device *dev, int fd)
    }
    pthread_mutex_unlock(&dev->bo_map_lock);
 
-   if (dev->debug & AGX_DBG_TRACE)
+   if (dev->debug & AGX_DBG_TRACE) {
+      agx_bo_map(bo);
       agxdecode_track_alloc(dev->agxdecode, bo);
+   }
 
    return bo;