diff --git a/src/main/java/org/olat/course/run/CourseRuntimeController.java b/src/main/java/org/olat/course/run/CourseRuntimeController.java
index 384dc0ac09f9c8b9787fa90c9be97b9d57feae43..fa2da8718176c94369c7ccbf6c8041b1cd3d8765 100644
--- a/src/main/java/org/olat/course/run/CourseRuntimeController.java
+++ b/src/main/java/org/olat/course/run/CourseRuntimeController.java
@@ -805,9 +805,9 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
 			ICourse course = CourseFactory.loadCourse(getRepositoryEntry().getOlatResource());
 			CourseNode currentCourseNode = getCurrentCourseNode();
 			EditorMainController ctrl = CourseFactory.createEditorController(ureq, getWindowControl(), course, currentCourseNode);
-			editorCtrl = pushController(ureq, "Editor", ctrl);
 			//user activity logger which was initialized with course run
-			if(editorCtrl != null){
+			if(ctrl != null){
+				editorCtrl = pushController(ureq, "Editor", ctrl);
 				listenTo(editorCtrl);
 				setIsInEditor(true);
 				currentToolCtr = editorCtrl;