diff --git a/scnserver/api/handler/compat.go b/scnserver/api/handler/compat.go
index f8a6201..08dfd7e 100644
--- a/scnserver/api/handler/compat.go
+++ b/scnserver/api/handler/compat.go
@@ -528,7 +528,7 @@ func (h CompatHandler) Requery(g *gin.Context) ginresp.HTTPResponse {
 	compMsgs := make([]models.CompatMessage, 0, len(msgs))
 	for _, v := range msgs {
 
-		messageIdComp, err := h.database.ConvertToCompatIDOrCreate(ctx, v.MessageID.String(), "messageid")
+		messageIdComp, err := h.database.ConvertToCompatIDOrCreate(ctx, "messageid", v.MessageID.String())
 		if err != nil {
 			return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query/create messageid<old>", err)
 		}
diff --git a/scnserver/jobs/DeliveryRetryJob.go b/scnserver/jobs/DeliveryRetryJob.go
index 8f88d11..2fc949e 100644
--- a/scnserver/jobs/DeliveryRetryJob.go
+++ b/scnserver/jobs/DeliveryRetryJob.go
@@ -168,7 +168,7 @@ func (j *DeliveryRetryJob) redeliver(ctx *logic.SimpleContext, delivery models.D
 		var msgidOverride *string = nil
 		if isCompatClient {
 
-			messageIdComp, err := j.app.Database.Primary.ConvertToCompatIDOrCreate(ctx, msg.MessageID.String(), "messageid")
+			messageIdComp, err := j.app.Database.Primary.ConvertToCompatIDOrCreate(ctx, "messageid", msg.MessageID.String())
 			if err != nil {
 				log.Err(err).Str("MessageID", delivery.MessageID.String()).Str("ClientID", client.ClientID.String()).Msg("Failed to query/create messageid")
 				ctx.RollbackTransaction()