diff --git a/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java b/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java
index e3e29a20a8a86618d455a2374aef634e75c95cbd..e31e599d5f3ab5b9a6162975e0618f5e880fdc53 100644
--- a/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java
+++ b/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java
@@ -383,7 +383,8 @@ public class LinkFileCombiCalloutController extends BasicController {
 	 * @param newModalContentController
 	 */
 	private void displayModal(Controller newModalContentController) {
-		if (guardModalController(newModalContentController)) return;
+		if (newModalContentController == null) return;
+		
 		currentModalController = newModalContentController;
 		listenTo(currentModalController);
 		cmc = new CloseableModalController(getWindowControl(), "close", newModalContentController.getInitialComponent());