diff --git a/backend/internal/db/datasaver/messages.go b/backend/internal/db/datasaver/messages.go
index c594f7ed9..0f24d237e 100644
--- a/backend/internal/db/datasaver/messages.go
+++ b/backend/internal/db/datasaver/messages.go
@@ -1,6 +1,7 @@
 package datasaver
 
 import (
+	"fmt"
 	. "openreplay/backend/pkg/messages"
 )
 
@@ -8,7 +9,10 @@ func (mi *Saver) InsertMessage(sessionID uint64, msg Message) error {
 	switch m := msg.(type) {
 	// Common
 	case *Metadata:
-		return mi.pg.InsertMetadata(sessionID, m)
+		if err := mi.pg.InsertMetadata(sessionID, m); err != nil {
+			return fmt.Errorf("insert metadata err: %s", err)
+		}
+		return nil
 	case *IssueEvent:
 		return mi.pg.InsertIssueEvent(sessionID, m)
 	//TODO: message adapter (transformer) (at the level of pkg/message) for types: *IOSMetadata, *IOSIssueEvent and others
diff --git a/backend/pkg/db/postgres/messages-common.go b/backend/pkg/db/postgres/messages-common.go
index 2fdb6ecfb..c21221ebf 100644
--- a/backend/pkg/db/postgres/messages-common.go
+++ b/backend/pkg/db/postgres/messages-common.go
@@ -164,12 +164,7 @@ func (conn *Conn) InsertMetadata(sessionID uint64, keyNo uint, value string) err
 	sqlRequest := `
 		UPDATE sessions SET  metadata_%v = $1
 		WHERE session_id = $2`
-	conn.batchQueue(sessionID, fmt.Sprintf(sqlRequest, keyNo), value, sessionID)
-	// conn.insertAutocompleteValue(sessionID, "METADATA", value)
-
-	// Record approximate message size
-	conn.updateBatchSize(sessionID, len(sqlRequest)+len(value)+8*2)
-	return nil
+	return conn.exec(fmt.Sprintf(sqlRequest, keyNo), value, sessionID)
 }
 
 func (conn *Conn) InsertIssueEvent(sessionID uint64, projectID uint32, e *messages.IssueEvent) error {