diff --git a/src/database.c b/src/database.c
index 7586298c..8b7f0ad3 100644
--- a/src/database.c
+++ b/src/database.c
@@ -673,6 +673,15 @@ int db__message_store_find(struct mosquitto *context, uint16_t mid, struct mosqu
 		tail = tail->next;
 	}
 
+	tail = context->queued_msgs;
+	while(tail){
+		if(tail->store->source_mid == mid && tail->direction == mosq_md_in){
+			*stored = tail->store;
+			return MOSQ_ERR_SUCCESS;
+		}
+		tail = tail->next;
+	}
+
 	return 1;
 }