diff --git a/src/main/java/org/eclipse/jetty/spdy/StandardSession.java b/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
index f0b6c07abd1..bc96f90c69c 100644
--- a/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
+++ b/src/main/java/org/eclipse/jetty/spdy/StandardSession.java
@@ -718,7 +718,6 @@ public class StandardSession implements ISession, Parser.Listener, ISession.Cont
             }
             else
             {
-                stream.updateCloseState(data.isClose());
                 if (stream.isClosed())
                     removeStream(stream);
             }
diff --git a/src/main/java/org/eclipse/jetty/spdy/StandardStream.java b/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
index 5181b0a59c3..8f4c1907cef 100644
--- a/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
+++ b/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
@@ -247,9 +247,7 @@ public class StandardStream implements IStream
     @Override
     public void data(DataInfo dataInfo)
     {
-        // We do not update the close state here, because the dataInfo may
-        // generate several frames and in the middle we may receive window
-        // updates, so we need the stream to update the window size
+        updateCloseState(dataInfo.isClose());
         session.data(this, dataInfo);
     }