diff --git a/wgpu-core/src/device/queue.rs b/wgpu-core/src/device/queue.rs
index 5e8cb4be02..18c5921700 100644
--- a/wgpu-core/src/device/queue.rs
+++ b/wgpu-core/src/device/queue.rs
@@ -1153,7 +1153,7 @@ impl Global {
                     for &cmb_id in command_buffer_ids {
                         // we reset the used surface textures every time we use
                         // it, so make sure to set_size on it.
-                        used_surface_textures.set_size(hub.textures.read().len());
+                        used_surface_textures.set_size(device.tracker_indices.textures.size());
 
                         #[allow(unused_mut)]
                         let mut cmdbuf = match command_buffer_guard.replace_with_error(cmb_id) {
diff --git a/wgpu-core/src/present.rs b/wgpu-core/src/present.rs
index 63052c6020..4bf9c42929 100644
--- a/wgpu-core/src/present.rs
+++ b/wgpu-core/src/present.rs
@@ -220,7 +220,10 @@ impl Global {
                         layers: 0..1,
                         mips: 0..1,
                     },
-                    info: ResourceInfo::new("<Surface>", None),
+                    info: ResourceInfo::new(
+                        "<Surface Texture>",
+                        Some(device.tracker_indices.textures.clone()),
+                    ),
                     clear_mode: RwLock::new(resource::TextureClearMode::Surface {
                         clear_view: Some(clear_view),
                     }),