Index: lams_common/src/java/org/lamsfoundation/lams/web/controller/AbstractTimeLimitWebsocketServer.java
===================================================================
diff -u -r705c0f72b765849974bfa0d9f8b04797619e8da7 -r4352b39a6fd8ac3ccf9c75d6284179c9f004bf4e
--- lams_common/src/java/org/lamsfoundation/lams/web/controller/AbstractTimeLimitWebsocketServer.java	(.../AbstractTimeLimitWebsocketServer.java)	(revision 705c0f72b765849974bfa0d9f8b04797619e8da7)
+++ lams_common/src/java/org/lamsfoundation/lams/web/controller/AbstractTimeLimitWebsocketServer.java	(.../AbstractTimeLimitWebsocketServer.java)	(revision 4352b39a6fd8ac3ccf9c75d6284179c9f004bf4e)
@@ -229,8 +229,13 @@
 		}
 
 		LocalDateTime launchedDate = timeCache.timeLimitLaunchedDate.get(userId);
-		// user (re)entered the activity, so update him with time limit
-		if (launchedDate == null || !launchedDate.equals(existingLaunchDate)) {
+		if (existingLaunchDate == null) {
+		    if (launchedDate != null) {
+			updateUser = true;
+			timeCache.timeLimitLaunchedDate.remove(userId);
+		    }
+		} else if (launchedDate == null || !launchedDate.equals(existingLaunchDate)) {
+		    // user (re)entered the activity, so update him with time limit
 		    updateUser = true;
 		    timeCache.timeLimitLaunchedDate.put(userId, existingLaunchDate);
 		}