diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/lifecycle/UIThread.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/lifecycle/UIThread.java
index 9a082a7ef..a9d75cd0c 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/lifecycle/UIThread.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/lifecycle/UIThread.java
@@ -115,17 +115,19 @@ public void terminateThread() {
     // Prepare a service context to be used by the UI thread that may continue
     // to run as a result of the interrupt call
     ServiceContext serviceContext = ContextUtil.createFakeContext( uiSession );
-    setServiceContext( serviceContext );
-    uiThreadTerminating = true;
-    // interrupt the UI thread that is expected to wait in switchThread or already be terminated
-    synchronized( getLock() ) {
-      getThread().interrupt();
-    }
-    try {
-      getThread().join();
-    } catch( InterruptedException e ) {
-      String msg = "Received InterruptedException while terminating UIThread";
-      ServletLog.log( msg, e );
+    setServiceContext( serviceContext );    
+    while (getThread().isAlive()) {
+      uiThreadTerminating = true;
+      // interrupt the UI thread that is expected to wait in switchThread or already be terminated
+      synchronized( getLock() ) {
+        getThread().interrupt();
+      }
+      try {
+        getThread().join(5000);      
+      } catch( InterruptedException e ) {
+        String msg = "Received InterruptedException while terminating UIThread";
+        ServletLog.log( msg, e );
+      }
     }
     uiThreadTerminating = false;
   }