diff --git a/federationsender/queue/queue.go b/federationsender/queue/queue.go
index 66ab55786..f83890bb2 100644
--- a/federationsender/queue/queue.go
+++ b/federationsender/queue/queue.go
@@ -121,7 +121,7 @@ func (oqs *OutgoingQueues) SendEvent(
 		"destinations": destinations, "event": ev.EventID(),
 	}).Info("Sending event")
 
-	nid, err := oqs.db.StoreJSON(context.TODO(), ev.JSON())
+	nid, err := oqs.db.StoreJSON(context.TODO(), string(ev.JSON()))
 	if err != nil {
 		return fmt.Errorf("sendevent: oqs.db.StoreJSON: %w", err)
 	}
diff --git a/federationsender/storage/interface.go b/federationsender/storage/interface.go
index 973eb474f..f4df93fa4 100644
--- a/federationsender/storage/interface.go
+++ b/federationsender/storage/interface.go
@@ -26,7 +26,7 @@ type Database interface {
 	internal.PartitionStorer
 	UpdateRoom(ctx context.Context, roomID, oldEventID, newEventID string, addHosts []types.JoinedHost, removeHosts []string) (joinedHosts []types.JoinedHost, err error)
 	GetJoinedHosts(ctx context.Context, roomID string) ([]types.JoinedHost, error)
-	StoreJSON(ctx context.Context, js []byte) (int64, error)
+	StoreJSON(ctx context.Context, js string) (int64, error)
 	AssociatePDUWithDestination(ctx context.Context, transactionID gomatrixserverlib.TransactionID, serverName gomatrixserverlib.ServerName, nids []int64) error
 	GetNextTransactionPDUs(ctx context.Context, serverName gomatrixserverlib.ServerName, limit int) (gomatrixserverlib.TransactionID, []*gomatrixserverlib.HeaderedEvent, error)
 	CleanTransactionPDUs(ctx context.Context, serverName gomatrixserverlib.ServerName, transactionID gomatrixserverlib.TransactionID) error
diff --git a/federationsender/storage/postgres/storage.go b/federationsender/storage/postgres/storage.go
index d4719c7aa..7a64d4573 100644
--- a/federationsender/storage/postgres/storage.go
+++ b/federationsender/storage/postgres/storage.go
@@ -138,15 +138,11 @@ func (d *Database) GetJoinedHosts(
 // a NID. The NID will then be used when inserting the per-destination
 // metadata entries.
 func (d *Database) StoreJSON(
-	ctx context.Context, js []byte,
+	ctx context.Context, js string,
 ) (int64, error) {
-	res, err := d.insertJSONStmt.ExecContext(ctx, js)
+	nid, err := d.insertQueueJSON(ctx, nil, js)
 	if err != nil {
-		return 0, fmt.Errorf("d.insertRetryJSONStmt: %w", err)
-	}
-	nid, err := res.LastInsertId()
-	if err != nil {
-		return 0, fmt.Errorf("res.LastInsertID: %w", err)
+		return 0, fmt.Errorf("d.insertQueueJSON: %w", err)
 	}
 	return nid, nil
 }
diff --git a/federationsender/storage/sqlite3/storage.go b/federationsender/storage/sqlite3/storage.go
index b0fe039e3..7aab83fba 100644
--- a/federationsender/storage/sqlite3/storage.go
+++ b/federationsender/storage/sqlite3/storage.go
@@ -144,15 +144,11 @@ func (d *Database) GetJoinedHosts(
 // a NID. The NID will then be used when inserting the per-destination
 // metadata entries.
 func (d *Database) StoreJSON(
-	ctx context.Context, js []byte,
+	ctx context.Context, js string,
 ) (int64, error) {
-	res, err := d.insertJSONStmt.ExecContext(ctx, js)
+	nid, err := d.insertQueueJSON(ctx, nil, js)
 	if err != nil {
-		return 0, fmt.Errorf("d.insertRetryJSONStmt: %w", err)
-	}
-	nid, err := res.LastInsertId()
-	if err != nil {
-		return 0, fmt.Errorf("res.LastInsertID: %w", err)
+		return 0, fmt.Errorf("d.insertQueueJSON: %w", err)
 	}
 	return nid, nil
 }