diff --git a/src/database.c b/src/database.c
index 414d77802a..3016df344b 100644
--- a/src/database.c
+++ b/src/database.c
@@ -918,7 +918,6 @@ int db__message_remove_incoming(struct mosquitto* context, uint16_t mid)
 	}
 }
 
-
 int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
 {
 	struct mosquitto_client_msg *tail, *tmp;
diff --git a/src/handle_publish.c b/src/handle_publish.c
index 55fb3c20bf..75bc8f2392 100644
--- a/src/handle_publish.c
+++ b/src/handle_publish.c
@@ -286,9 +286,9 @@ int handle__publish(struct mosquitto *context)
 		db__message_store_find(context, msg->source_mid, &stored);
 	}
 
-	if (stored && (stored->qos != msg->qos || stored->payloadlen != msg->payloadlen || strcmp(stored->topic, msg->topic) || memcmp(stored->payload, msg->payload, msg->payloadlen))){
-		log__printf(NULL, MOSQ_LOG_WARNING, "Reused message ID from %s detected. Clearing from storage.", context->id);
-		db__message_remove_incoming(context, stored->mid);
+	if (stored && msg->source_mid != 0 && (stored->qos != msg->qos || stored->payloadlen != msg->payloadlen || strcmp(stored->topic, msg->topic) || memcmp(stored->payload, msg->payload, msg->payloadlen) )){
+		log__printf(NULL, MOSQ_LOG_WARNING, "Reused message ID %u from %s detected. Clearing from storage.", msg->source_mid, context->id);
+		db__message_remove_incoming(context, msg->source_mid);
 		stored = NULL;
 	}
 
diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h
index 5b88710f46..78b8d0afa0 100644
--- a/src/mosquitto_broker_internal.h
+++ b/src/mosquitto_broker_internal.h
@@ -639,6 +639,7 @@ int persist__restore(void);
 int db__message_count(int *count);
 int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_state expect_state, int qos);
 int db__message_insert(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_direction dir, uint8_t qos, bool retain, struct mosquitto_msg_store *stored, mosquitto_property *properties, bool update);
+int db__message_remove_incoming(struct mosquitto* context, uint16_t mid);
 int db__message_release_incoming(struct mosquitto *context, uint16_t mid);
 int db__message_update_outgoing(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_state state, int qos);
 void db__message_dequeue_first(struct mosquitto *context, struct mosquitto_msg_data *msg_data);