diff --git a/src/server.c b/src/server.c
index c5b6678862b77de077c53422d60a3950daeab9fa..d85e10d95eafc685660fdfda4117954b01379d0f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2681,8 +2681,9 @@ int processCommand(client *c) {
         return C_OK;
     }
 
-    /* Only allow SUBSCRIBE and UNSUBSCRIBE in the context of Pub/Sub */
-    if (c->flags & CLIENT_PUBSUB &&
+    /* Only allow a subset of commands in the context of Pub/Sub if the
+     * connection is in RESP2 mode. With RESP3 there are no limits. */
+    if ((c->flags & CLIENT_PUBSUB && c->resp == 2) &&
         c->cmd->proc != pingCommand &&
         c->cmd->proc != subscribeCommand &&
         c->cmd->proc != unsubscribeCommand &&