1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index dd998e760c..a452cfff2d 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -768,6 +768,10 @@ public class ApplicationConnection {
         if (!hasActiveRequest) {
             throw new IllegalStateException("No active request");
         }
+        // After checkForPendingVariableBursts() there may be a new active
+        // request, so we must set hasActiveRequest to false before, not after,
+        // the call. Active requests used to be tracked with an integer counter,
+        // so setting it after used to work but not with the #8505 changes.
         hasActiveRequest = false;
         if (applicationRunning) {
             checkForPendingVariableBursts();