diff --git a/src/main/java/org/redisson/Redisson.java b/src/main/java/org/redisson/Redisson.java
index 6944174dd..eb5eda2be 100755
--- a/src/main/java/org/redisson/Redisson.java
+++ b/src/main/java/org/redisson/Redisson.java
@@ -301,9 +301,14 @@ public class Redisson implements RedissonClient {
     }
 
     public void flushdb() {
-        commandExecutor.writeAllAsync(RedisCommands.FLUSHDB).awaitUninterruptibly();
+        commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHDB));
     }
 
+    public void flushall() {
+        commandExecutor.get(commandExecutor.writeAllAsync(RedisCommands.FLUSHALL));
+    }
+
+
     @Override
     public RBatch createBatch() {
         return new RedissonBatch(connectionManager);
diff --git a/src/main/java/org/redisson/client/protocol/RedisCommands.java b/src/main/java/org/redisson/client/protocol/RedisCommands.java
index 2517efd82..dbddf3588 100644
--- a/src/main/java/org/redisson/client/protocol/RedisCommands.java
+++ b/src/main/java/org/redisson/client/protocol/RedisCommands.java
@@ -109,7 +109,8 @@ public interface RedisCommands {
     RedisStrictCommand<String> SELECT = new RedisStrictCommand<String>("SELECT", new StringReplayDecoder());
     RedisStrictCommand<Boolean> CLIENT_SETNAME = new RedisStrictCommand<Boolean>("CLIENT", "SETNAME", new BooleanReplayConvertor());
     RedisStrictCommand<String> CLIENT_GETNAME = new RedisStrictCommand<String>("CLIENT", "GETNAME", new StringDataDecoder());
-    RedisStrictCommand<String> FLUSHDB = new RedisStrictCommand<String>("FLUSHDB");
+    RedisStrictCommand<Void> FLUSHDB = new RedisStrictCommand<Void>("FLUSHDB", new VoidReplayConvertor());
+    RedisStrictCommand<Void> FLUSHALL = new RedisStrictCommand<Void>("FLUSHALL", new VoidReplayConvertor());
 
     RedisStrictCommand<List<String>> KEYS = new RedisStrictCommand<List<String>>("KEYS", new StringListReplayDecoder());