1 files changed, 8 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java
index d483b39a7b..543a48f61b 100644
--- a/client/src/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/com/vaadin/client/ApplicationConfiguration.java
@@ -222,6 +222,7 @@ public class ApplicationConfiguration implements EntryPoint {
 
     private boolean browserDetailsSent = false;
     private boolean widgetsetVersionSent = false;
+    private static boolean moduleLoaded = false;
 
     static// TODO consider to make this hashmap per application
     LinkedList<Command> callbacks = new LinkedList<Command>();
@@ -596,6 +597,13 @@ public class ApplicationConfiguration implements EntryPoint {
 
     @Override
     public void onModuleLoad() {
+
+        // Don't run twice if the module has been inherited several times.
+        if (moduleLoaded) {
+            return;
+        }
+        moduleLoaded = true;
+
         Profiler.initialize();
         Profiler.enter("ApplicationConfiguration.onModuleLoad");