diff --git a/internal/handler/cmd_query.go b/internal/handler/cmd_query.go
index 3b77bbbc2c23..b5edf6db0355 100644
--- a/internal/handler/cmd_query.go
+++ b/internal/handler/cmd_query.go
@@ -46,7 +46,9 @@ func (h *Handler) CmdQuery(ctx context.Context, query *wire.OpQuery) (*wire.OpRe
 
 		dbName, err := common.GetRequiredParam[string](document, "db")
 		if err != nil {
-			return nil, lazyerrors.Error(err)
+			reply.SetDocument(replyDoc)
+
+			return reply, nil
 		}
 
 		doc, err := h.saslStart(ctx, dbName, document)