diff --git a/src/database.c b/src/database.c
index 6ca70d9c..792cfad3 100644
--- a/src/database.c
+++ b/src/database.c
@@ -144,7 +144,7 @@ int db__open(struct mosquitto__config *config)
 
 	if(!config) return MOSQ_ERR_INVAL;
 
-	db.last_db_id = 0;
+	util__random_bytes(&db.last_db_id, sizeof(db.last_db_id));
 
 	db.contexts_by_id = NULL;
 	db.contexts_by_sock = NULL;
diff --git a/test/unit/subs_stubs.c b/test/unit/subs_stubs.c
index d85a8cca..f1d45265 100644
--- a/test/unit/subs_stubs.c
+++ b/test/unit/subs_stubs.c
@@ -225,3 +225,11 @@ void util__increment_send_quota(struct mosquitto *mosq)
 {
 	mosq->msgs_out.inflight_quota++;
 }
+
+int util__random_bytes(void *bytes, int count)
+{
+	UNUSED(bytes);
+	UNUSED(count);
+
+	return MOSQ_ERR_SUCCESS;
+}