diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/AbstractHttp2StreamChannel.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/AbstractHttp2StreamChannel.java
index 5b4e342f85..6ccff12288 100644
--- a/codec-http2/src/main/java/io/netty/handler/codec/http2/AbstractHttp2StreamChannel.java
+++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/AbstractHttp2StreamChannel.java
@@ -751,6 +751,8 @@ abstract class AbstractHttp2StreamChannel extends DefaultAttributeMap implements
             if (!isActive()) {
                 return;
             }
+            updateLocalWindowIfNeeded();
+
             switch (readStatus) {
                 case IDLE:
                     readStatus = ReadStatus.IN_PROGRESS;
@@ -827,8 +829,6 @@ abstract class AbstractHttp2StreamChannel extends DefaultAttributeMap implements
                 readStatus = ReadStatus.IDLE;
             }
 
-            updateLocalWindowIfNeeded();
-
             allocHandle.readComplete();
             pipeline().fireChannelReadComplete();
             if (config().isAutoRead()) {