diff --git a/redisson/src/main/java/org/redisson/command/RedisExecutor.java b/redisson/src/main/java/org/redisson/command/RedisExecutor.java
index ea6f2834c..fa0f141af 100644
--- a/redisson/src/main/java/org/redisson/command/RedisExecutor.java
+++ b/redisson/src/main/java/org/redisson/command/RedisExecutor.java
@@ -174,6 +174,12 @@ public class RedisExecutor<V, R> {
                     return;
                 }
 
+                if (connectionManager.getServiceManager().isShuttingDown()) {
+                    exception = new RedissonShutdownException("Redisson is shutdown");
+                    tryComplete(attemptPromise, exception);
+                    return;
+                }
+
                 if (connectionFuture.isDone() && connectionFuture.isCompletedExceptionally()) {
                     exception = convertException(connectionFuture);
                     tryComplete(attemptPromise, exception);