diff --git a/src/server.c b/src/server.c
index 8cdbdad7..c5b66788 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2924,7 +2924,7 @@ void pingCommand(client *c) {
         return;
     }
 
-    if (c->flags & CLIENT_PUBSUB) {
+    if (c->flags & CLIENT_PUBSUB && c->resp == 2) {
         addReply(c,shared.mbulkhdr[2]);
         addReplyBulkCBuffer(c,"pong",4);
         if (c->argc == 1)