diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
index 997fdc416c4..6bdc88cc2b6 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
@@ -415,16 +415,17 @@ public class SslConnection extends AbstractConnection
                             break;
                     }      
                 }
-
-                boolean filled = getFillInterest().fillable();
-                if (!filled && waiting_for_fill)
-                    fill(BufferUtil.EMPTY_BUFFER);
-/*
-                // Ensure a fill is always done if needed then wake up any fill interest
-                if (waiting_for_fill)
-                    fill(BufferUtil.EMPTY_BUFFER);
+                
                 getFillInterest().fillable();
-*/
+                if (waiting_for_fill)
+                {
+                  synchronized(_decryptedEndPoint)
+                  {
+                    waiting_for_fill = _flushState==FlushState.WAIT_FOR_FILL;
+                  }
+                  if (waiting_for_fill)
+                    fill(BufferUtil.EMPTY_BUFFER);
+                }
             }
             catch (Throwable e)
             {