diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
index 25c4b562a1..1c38942238 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
@@ -143,10 +143,6 @@ public class AMQPConnectionContext extends ProtonInitializable {
       handler.flush();
    }
 
-   public void flush(boolean wait) {
-      handler.flush(wait);
-   }
-
    public void close(ErrorCondition errorCondition) {
       handler.close(errorCondition);
    }
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
index 6b66f62cc5..045016a01c 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/handler/ProtonHandler.java
@@ -56,12 +56,7 @@ public class ProtonHandler extends ProtonInitializable {
 
    private final Executor dispatchExecutor;
 
-   private final Runnable dispatchRunnable = new Runnable() {
-      @Override
-      public void run() {
-         dispatch();
-      }
-   };
+   private final Runnable dispatchRunnable = () -> dispatch();
 
    private ArrayList<EventHandler> handlers = new ArrayList<>();
 
@@ -251,22 +246,12 @@ public class ProtonHandler extends ProtonInitializable {
    }
 
    public void flush() {
-      flush(false);
-   }
-
-   public void flush(boolean wait) {
       synchronized (lock) {
          transport.process();
-
          checkServerSASL();
-
       }
 
-      if (wait) {
-         dispatch();
-      } else {
-         dispatchExecutor.execute(dispatchRunnable);
-      }
+      dispatchExecutor.execute(dispatchRunnable);
    }
 
    public void close(ErrorCondition errorCondition) {
@@ -276,7 +261,8 @@ public class ProtonHandler extends ProtonInitializable {
          }
          connection.close();
       }
-      flush(true);
+
+      flush();
    }
 
    protected void checkServerSASL() {