diff --git a/src/main/java/org/redisson/client/handler/CommandDecoder.java b/src/main/java/org/redisson/client/handler/CommandDecoder.java
index 5bfa0e97c..d05c9ff27 100644
--- a/src/main/java/org/redisson/client/handler/CommandDecoder.java
+++ b/src/main/java/org/redisson/client/handler/CommandDecoder.java
@@ -328,9 +328,9 @@ public class CommandDecoder extends ReplayingDecoder<State> {
         if (decoder == null) {
             if (data.getCommand().getOutParamType() == ValueType.MAP) {
                 if (parts.size() % 2 != 0) {
-                    decoder = data.getCodec().getMapKeyDecoder();
-                } else {
                     decoder = data.getCodec().getMapValueDecoder();
+                } else {
+                    decoder = data.getCodec().getMapKeyDecoder();
                 }
             } else if (data.getCommand().getOutParamType() == ValueType.MAP_KEY) {
                 decoder = data.getCodec().getMapKeyDecoder();