diff --git a/src/main/java/me/loper/storage/nosql/redis/RedisConnectionFactory.java b/src/main/java/me/loper/storage/nosql/redis/RedisConnectionFactory.java
index f1fc5db..0639db1 100644
--- a/src/main/java/me/loper/storage/nosql/redis/RedisConnectionFactory.java
+++ b/src/main/java/me/loper/storage/nosql/redis/RedisConnectionFactory.java
@@ -68,7 +68,10 @@ private RedisURI createRedisURI(RedisStorageCredentials credentials) {
 
     @Override
     public void shutdown() {
-        this.connection.close();
+        if (this.connection.isOpen()) {
+            this.connection.close();
+        }
+
         this.resources.shutdown();
         this.client.shutdown();
     }