Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
===================================================================
diff -u -r5009e72ce26a04aa0654d6a6a53eb177c99f42d8 -r9e266179c987af5028400429c1df6a29924bfa7f
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(.../LessonService.java)	(revision 5009e72ce26a04aa0654d6a6a53eb177c99f42d8)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(.../LessonService.java)	(revision 9e266179c987af5028400429c1df6a29924bfa7f)
@@ -123,11 +123,11 @@
 			HashMap<Integer,User> lessonUsersMap = lessonMaps.get(lesson.getLessonId());
 			if (lessonUsersMap != null) {
 				lessonUsersMap.remove(learner.getUserId());
+				if (lessonUsersMap.size()==0) {
+					// no one active in lesson? get rid of lesson from cache 
+					lessonMaps.remove(lesson.getLessonId());
+				}
 			}
-			if (lessonUsersMap.size()==0) {
-				// no one active in lesson? get rid of lesson from cache 
-				lessonMaps.remove(lesson.getLessonId());
-			}
 		}
     }