diff --git a/src/main/java/org/olat/course/run/RunMainController.java b/src/main/java/org/olat/course/run/RunMainController.java
index f19c6a4cdbb22d007d70f8abbf82168ba59c674b..837e7425aeafcfdfd4dbd3a28750c51ba9dfad74 100644
--- a/src/main/java/org/olat/course/run/RunMainController.java
+++ b/src/main/java/org/olat/course/run/RunMainController.java
@@ -397,7 +397,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene
 	}
 	
 	protected void updateNextPrevious() {
-		if(nextLink == null || previousLink == null || luTree == null) {
+		if (luTree == null) {
 			return;
 		}
 		
@@ -413,8 +413,13 @@ public class RunMainController extends MainLayoutBasicController implements Gene
 			hasPrevious = index > 0;
 			hasNext = index  >= 0 && index+1 < flatTree.size();
 		}
-		previousLink.setEnabled(hasPrevious);
-		nextLink.setEnabled(hasNext);
+		
+		if (previousLink != null) {
+			previousLink.setEnabled(hasPrevious);
+		}
+		if (nextLink != null) {
+			nextLink.setEnabled(hasNext);
+		}
 		if (paginationCtrl != null) {
 			paginationCtrl.updateNextPreviousUI(hasPrevious, hasNext);
 		}