diff --git a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
index 66bb2ccccd..4f599f638f 100644
--- a/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
+++ b/src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java
@@ -158,13 +158,11 @@ public <T> RedisCommand<K, V, T> dispatch(RedisCommand<K, V, T> command) {
 
         RedisCommand<K, V, T> toSend = preProcessCommand(command);
 
-        try {
-            return super.dispatch(toSend);
-        } finally {
-            if (command.getType().name().equals(MULTI.name())) {
-                multi = (multi == null ? new MultiOutput<>(codec) : multi);
-            }
+        if (command.getType().name().equals(MULTI.name())) {
+            multi = (multi == null ? new MultiOutput<>(codec) : multi);
         }
+
+        return super.dispatch(toSend);
     }
 
     @Override