diff --git a/virtio-devices/src/block.rs b/virtio-devices/src/block.rs
index 8e3e5d6fe..604d6a456 100644
--- a/virtio-devices/src/block.rs
+++ b/virtio-devices/src/block.rs
@@ -235,11 +235,7 @@ impl BlockEpollHandler {
         Ok(())
     }
 
-    fn process_queue_submit_and_signal(&mut self) -> result::Result<(), EpollHelperError> {
-        self.process_queue_submit().map_err(|e| {
-            EpollHelperError::HandleEvent(anyhow!("Failed to process queue (submit): {:?}", e))
-        })?;
-
+    fn try_signal_used_queue(&mut self) -> result::Result<(), EpollHelperError> {
         if self
             .queue
             .needs_notification(self.mem.memory().deref())
@@ -258,6 +254,14 @@ impl BlockEpollHandler {
         Ok(())
     }
 
+    fn process_queue_submit_and_signal(&mut self) -> result::Result<(), EpollHelperError> {
+        self.process_queue_submit().map_err(|e| {
+            EpollHelperError::HandleEvent(anyhow!("Failed to process queue (submit): {:?}", e))
+        })?;
+
+        self.try_signal_used_queue()
+    }
+
     #[inline]
     fn find_inflight_request(&mut self, completed_head: u16) -> Result<Request> {
         // This loop neatly handles the fast path where the completions are
@@ -514,8 +518,14 @@ impl EpollHelperHandler for BlockEpollHandler {
 
                 // Process the queue only when the rate limit is not reached
                 if !rate_limit_reached {
-                    self.process_queue_submit_and_signal()?
+                    self.process_queue_submit().map_err(|e| {
+                        EpollHelperError::HandleEvent(anyhow!(
+                            "Failed to process queue (submit): {:?}",
+                            e
+                        ))
+                    })?;
                 }
+                self.try_signal_used_queue()?;
             }
             RATE_LIMITER_EVENT => {
                 if let Some(rate_limiter) = &mut self.rate_limiter {