diff --git a/wgpu-core/src/device/life.rs b/wgpu-core/src/device/life.rs
index fecaaa4369..58654a7691 100644
--- a/wgpu-core/src/device/life.rs
+++ b/wgpu-core/src/device/life.rs
@@ -132,17 +132,15 @@ impl<B: hal::Backend> NonReferencedResources<B> {
         heaps_mutex: &Mutex<Heaps<B>>,
         descriptor_allocator_mutex: &Mutex<DescriptorAllocator<B>>,
     ) {
-        if !self.buffers.is_empty() {
+        if !self.buffers.is_empty() || !self.images.is_empty() {
             let mut heaps = heaps_mutex.lock();
             for (raw, memory) in self.buffers.drain(..) {
                 log::trace!("Buffer {:?} is destroyed with memory {:?}", raw, memory);
                 device.destroy_buffer(raw);
                 heaps.free(device, memory);
             }
-        }
-        if !self.images.is_empty() {
-            let mut heaps = heaps_mutex.lock();
             for (raw, memory) in self.images.drain(..) {
+                log::trace!("Image {:?} is destroyed with memory {:?}", raw, memory);
                 device.destroy_image(raw);
                 heaps.free(device, memory);
             }
@@ -204,14 +202,14 @@ pub enum WaitIdleError {
 ///   3. When `ActiveSubmission` is retired, the mapped buffers associated with it are moved to `ready_to_map` vector.
 ///   4. Finally, `handle_mapping` issues all the callbacks.
 #[derive(Debug)]
-pub struct LifetimeTracker<B: hal::Backend> {
+pub(crate) struct LifetimeTracker<B: hal::Backend> {
     /// Resources that the user has requested be mapped, but are still in use.
     mapped: Vec<Stored<id::BufferId>>,
     /// Buffers can be used in a submission that is yet to be made, by the
     /// means of `write_buffer()`, so we have a special place for them.
-    pub future_suspected_buffers: Vec<id::BufferId>,
+    pub future_suspected_buffers: Vec<Stored<id::BufferId>>,
     /// Textures can be used in the upcoming submission by `write_texture`.
-    pub future_suspected_textures: Vec<id::TextureId>,
+    pub future_suspected_textures: Vec<Stored<id::TextureId>>,
     /// Resources that are suspected for destruction.
     pub suspected_resources: SuspectedResources,
     /// Resources that are not referenced any more but still used by GPU.
@@ -246,12 +244,16 @@ impl<B: hal::Backend> LifetimeTracker<B> {
     ) {
         let mut last_resources = NonReferencedResources::new();
         last_resources.buffers.extend(temp_buffers);
-        self.suspected_resources
-            .buffers
-            .extend(self.future_suspected_buffers.drain(..));
-        self.suspected_resources
-            .textures
-            .extend(self.future_suspected_textures.drain(..));
+        self.suspected_resources.buffers.extend(
+            self.future_suspected_buffers
+                .drain(..)
+                .map(|stored| stored.value),
+        );
+        self.suspected_resources.textures.extend(
+            self.future_suspected_textures
+                .drain(..)
+                .map(|stored| stored.value),
+        );
         self.suspected_resources.extend(new_suspects);
         self.active.alloc().init(ActiveSubmission {
             index,
diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs
index 8c9ca6badf..fe5660995e 100644
--- a/wgpu-core/src/device/mod.rs
+++ b/wgpu-core/src/device/mod.rs
@@ -879,18 +879,21 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
         let mut token = Token::root();
 
         log::info!("Buffer {:?} is dropped", buffer_id);
-        let device_id = {
+        let (ref_count, device_id) = {
             let (mut buffer_guard, _) = hub.buffers.write(&mut token);
             let buffer = &mut buffer_guard[buffer_id];
-            buffer.life_guard.ref_count.take();
-            buffer.device_id.value
+            let ref_count = buffer.life_guard.ref_count.take().unwrap();
+            (ref_count, buffer.device_id.value)
         };
 
         let (device_guard, mut token) = hub.devices.read(&mut token);
         device_guard[device_id]
             .lock_life(&mut token)
             .future_suspected_buffers
-            .push(buffer_id);
+            .push(Stored {
+                value: buffer_id,
+                ref_count,
+            });
     }
 
     pub fn device_create_texture<B: GfxBackend>(
@@ -934,18 +937,21 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
         let hub = B::hub(self);
         let mut token = Token::root();
 
-        let device_id = {
+        let (ref_count, device_id) = {
             let (mut texture_guard, _) = hub.textures.write(&mut token);
             let texture = &mut texture_guard[texture_id];
-            texture.life_guard.ref_count.take();
-            texture.device_id.value
+            let ref_count = texture.life_guard.ref_count.take().unwrap();
+            (ref_count, texture.device_id.value)
         };
 
         let (device_guard, mut token) = hub.devices.read(&mut token);
         device_guard[device_id]
             .lock_life(&mut token)
             .future_suspected_textures
-            .push(texture_id);
+            .push(Stored {
+                value: texture_id,
+                ref_count,
+            });
     }
 
     pub fn texture_create_view<B: GfxBackend>(