diff --git a/wgpu-core/src/device/global.rs b/wgpu-core/src/device/global.rs
index 0d4cc4fe91..91fb0b421c 100644
--- a/wgpu-core/src/device/global.rs
+++ b/wgpu-core/src/device/global.rs
@@ -259,12 +259,9 @@ impl Global {
     ) -> Result<(), WaitIdleError> {
         let hub = A::hub(self);
 
-        let last_submission = {
-            let buffer_guard = hub.buffers.write();
-            match buffer_guard.get(buffer_id) {
-                Ok(buffer) => buffer.submission_index(),
-                Err(_) => return Ok(()),
-            }
+        let last_submission = match hub.buffers.read().get(buffer_id) {
+            Ok(buffer) => buffer.submission_index(),
+            Err(_) => return Ok(()),
         };
 
         hub.devices