1 files changed, 1 insertions, 0 deletions
diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java
index fd8c73aa8f..636204cbf0 100644
--- a/server/src/com/vaadin/Application.java
+++ b/server/src/com/vaadin/Application.java
@@ -250,6 +250,7 @@ public class Application implements Terminal.ErrorListener, Serializable {
                 // initialized
                 return null;
             } else {
+                UI.setCurrent(uiInstance);
                 return uiInstance;
             }
         }