diff --git a/indexedDb/channels/handlers.go b/indexedDb/channels/handlers.go
index ddae6568e297d34710b0042704b65177f2eae5cb..fd7eba407ed1848088a1313f6089635a6d43f3a4 100644
--- a/indexedDb/channels/handlers.go
+++ b/indexedDb/channels/handlers.go
@@ -99,7 +99,7 @@ func (m *manager) messageReceivedCallback(
 
 	// Send it to the main thread
 	m.mh.SendResponse(
-		worker.GetMessageTag, worker.InitID, data)
+		worker.MessageReceivedCallbackTag, worker.InitID, data)
 }
 
 // storeDatabaseName sends the database name to the main thread and waits for
diff --git a/indexedDb/dm/handlers.go b/indexedDb/dm/handlers.go
index ba3d33d4c1a1627f0a3ac3bfc0e2390ec0a47153..d599cc4e5377f247f4dc7ce6f3e42f88051c0562 100644
--- a/indexedDb/dm/handlers.go
+++ b/indexedDb/dm/handlers.go
@@ -92,8 +92,7 @@ func (m *manager) messageReceivedCallback(
 	}
 
 	// Send it to the main thread
-	m.mh.SendResponse(
-		worker.GetMessageTag, worker.InitID, data)
+	m.mh.SendResponse(worker.MessageReceivedCallbackTag, worker.InitID, data)
 }
 
 // storeDatabaseName sends the database name to the main thread and waits for
diff --git a/indexedDbWorker/channels/init.go b/indexedDbWorker/channels/init.go
index 586ed8aa1dd921cb492f7dc45f9725e18f59cec7..b73d6f7d735c6938ead37a7365276d842dd0f734 100644
--- a/indexedDbWorker/channels/init.go
+++ b/indexedDbWorker/channels/init.go
@@ -61,8 +61,8 @@ func NewWASMEventModel(path string, encryption cryptoChannel.Cipher,
 	}
 
 	// Register handler to manage messages for the MessageReceivedCallback
-	wh.RegisterHandler(indexedDbWorker.GetMessageTag, indexedDbWorker.InitID,
-		false, messageReceivedCallbackHandler(cb))
+	wh.RegisterHandler(indexedDbWorker.MessageReceivedCallbackTag,
+		indexedDbWorker.InitID, false, messageReceivedCallbackHandler(cb))
 
 	// Register handler to manage checking encryption status from local storage
 	wh.RegisterHandler(indexedDbWorker.EncryptionStatusTag,
diff --git a/indexedDbWorker/dm/init.go b/indexedDbWorker/dm/init.go
index 5e4044e9564059778d481463b0cf50f49af0790b..460036288812f5e425e73e7640a631e8adf67d81 100644
--- a/indexedDbWorker/dm/init.go
+++ b/indexedDbWorker/dm/init.go
@@ -52,8 +52,8 @@ func NewWASMEventModel(path string, encryption cryptoChannel.Cipher,
 	}
 
 	// Register handler to manage messages for the MessageReceivedCallback
-	wh.RegisterHandler(indexedDbWorker.GetMessageTag, indexedDbWorker.InitID,
-		false, messageReceivedCallbackHandler(cb))
+	wh.RegisterHandler(indexedDbWorker.MessageReceivedCallbackTag,
+		indexedDbWorker.InitID, false, messageReceivedCallbackHandler(cb))
 
 	// Register handler to manage checking encryption status from local storage
 	wh.RegisterHandler(indexedDbWorker.EncryptionStatusTag,
diff --git a/indexedDbWorker/tag.go b/indexedDbWorker/tag.go
index fafc17535360076b646dc7de8fada1b54a0e5b67..dcda42cca518c44c64990577733d962489cc7730 100644
--- a/indexedDbWorker/tag.go
+++ b/indexedDbWorker/tag.go
@@ -20,9 +20,10 @@ type Tag string
 const (
 	ReadyTag Tag = "Ready"
 
-	NewWASMEventModelTag Tag = "NewWASMEventModel"
-	EncryptionStatusTag  Tag = "EncryptionStatus"
-	StoreDatabaseNameTag Tag = "StoreDatabaseName"
+	NewWASMEventModelTag       Tag = "NewWASMEventModel"
+	MessageReceivedCallbackTag Tag = "MessageReceivedCallback"
+	EncryptionStatusTag        Tag = "EncryptionStatus"
+	StoreDatabaseNameTag       Tag = "StoreDatabaseName"
 
 	JoinChannelTag         Tag = "JoinChannel"
 	LeaveChannelTag        Tag = "LeaveChannel"
@@ -53,5 +54,9 @@ var deleteAfterReceiving = map[Tag]struct{}{
 	ReceiveReactionTag:     {},
 	UpdateFromUUIDTag:      {},
 	UpdateFromMessageIDTag: {},
+	GetMessageTag:          {},
 	DeleteMessageTag:       {},
+	ReceiveTag:             {},
+	ReceiveTextTag:         {},
+	UpdateSentStatusTag:    {},
 }