diff --git a/src/main/java/org/olat/course/nodes/AbstractFeedCourseNode.java b/src/main/java/org/olat/course/nodes/AbstractFeedCourseNode.java
index bf8b1b2eeea7833768da7b81b7196fbb652c85d5..0a95578bd06f40bf7060b5c9bb57a025a5892c3e 100644
--- a/src/main/java/org/olat/course/nodes/AbstractFeedCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/AbstractFeedCourseNode.java
@@ -246,6 +246,8 @@ public abstract class AbstractFeedCourseNode extends GenericCourseNode {
 			RepositoryEntry re = handler.importResource(owner, rie.getInitialAuthor(), rie.getDisplayName(),
 				rie.getDescription(), false, locale, rie.importGetExportedFile(), null);
 			FeedNodeEditController.setReference(re, getModuleConfiguration());
+		} else {
+			FeedNodeEditController.removeReference(getModuleConfiguration());
 		}
 	}
 }
diff --git a/src/main/java/org/olat/course/nodes/CPCourseNode.java b/src/main/java/org/olat/course/nodes/CPCourseNode.java
index 0e37ab660384b58765142f4356c022ba7aa44f65..33abbeaecf0bc5b058290a6fa44f0d09abe5d639 100644
--- a/src/main/java/org/olat/course/nodes/CPCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/CPCourseNode.java
@@ -298,6 +298,8 @@ public class CPCourseNode extends AbstractAccessableCourseNode {
 			RepositoryEntry re = handler.importResource(owner, rie.getInitialAuthor(), rie.getDisplayName(),
 					rie.getDescription(), false, locale, rie.importGetExportedFile(), null);
 			CPEditController.setCPReference(re, getModuleConfiguration());
+		} else {
+			CPEditController.removeCPReference(getModuleConfiguration());
 		}
 	}
 
diff --git a/src/main/java/org/olat/course/nodes/IQSELFCourseNode.java b/src/main/java/org/olat/course/nodes/IQSELFCourseNode.java
index 6bc3e8296f589f0ae9e0d6b7f25c510ff72de71f..43d0921d4744f9f6c4b6351c686d39cd1909690a 100644
--- a/src/main/java/org/olat/course/nodes/IQSELFCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/IQSELFCourseNode.java
@@ -260,6 +260,8 @@ public class IQSELFCourseNode extends AbstractAccessableCourseNode implements Se
 			RepositoryEntry re = handler.importResource(owner, rie.getInitialAuthor(), rie.getDisplayName(),
 				rie.getDescription(), false, locale, rie.importGetExportedFile(), null);
 			IQEditController.setIQReference(re, getModuleConfiguration());
+		} else {
+			IQEditController.removeIQReference(getModuleConfiguration());
 		}
 	}
 
diff --git a/src/main/java/org/olat/course/nodes/IQSURVCourseNode.java b/src/main/java/org/olat/course/nodes/IQSURVCourseNode.java
index 250df8ca46f1214eafbdd7190ba2706c57264936..c920f3623d8faa898efa05774b8f0dbf598a1e86 100644
--- a/src/main/java/org/olat/course/nodes/IQSURVCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/IQSURVCourseNode.java
@@ -303,6 +303,8 @@ public class IQSURVCourseNode extends AbstractAccessableCourseNode implements QT
 			RepositoryEntry re = handler.importResource(owner, rie.getInitialAuthor(), rie.getDisplayName(),
 				rie.getDescription(), false, locale, rie.importGetExportedFile(), null);
 			IQEditController.setIQReference(re, getModuleConfiguration());
+		} else {
+			IQEditController.removeIQReference(getModuleConfiguration());
 		}
 	}
 
diff --git a/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java b/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
index 0baf43541a54a161e6750e3e1dce0ba6d654f09f..0422a92067085903be62790591e8635b02882087 100644
--- a/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
@@ -501,6 +501,8 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements As
 			RepositoryEntry re = handler.importResource(owner, rie.getInitialAuthor(), rie.getDisplayName(),
 				rie.getDescription(), false, locale, rie.importGetExportedFile(), null);
 			IQEditController.setIQReference(re, getModuleConfiguration());
+		} else {
+			IQEditController.removeIQReference(getModuleConfiguration());
 		}
 	}
 
diff --git a/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java b/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java
index 9aefb9adef907da9371c847dac1bac49f25a72c5..3aa6a46c30b804dce4f7ae4eca09e78f45d57d2e 100644
--- a/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java
@@ -432,7 +432,11 @@ public class PortfolioCourseNode extends AbstractAccessableCourseNode implements
 				EPFrontendManager ePFMgr = CoreSpringFactory.getImpl(EPFrontendManager.class);
 				PortfolioStructure map = ePFMgr.loadPortfolioStructure(re.getOlatResource());
 				PortfolioCourseNodeEditController.setReference(re, map, getModuleConfiguration());
+			} else {
+				PortfolioCourseNodeEditController.removeReference(getModuleConfiguration());
 			}
+		} else {
+			PortfolioCourseNodeEditController.removeReference(getModuleConfiguration());
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/ScormCourseNode.java b/src/main/java/org/olat/course/nodes/ScormCourseNode.java
index 1767d9b7479e5205a816181065ba88d524aea7b4..48ecf1a901d5331558cf0811baf3d335889fdd8a 100644
--- a/src/main/java/org/olat/course/nodes/ScormCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/ScormCourseNode.java
@@ -340,6 +340,8 @@ public class ScormCourseNode extends AbstractAccessableCourseNode implements Ass
 			RepositoryEntry re = handler.importResource(owner, rie.getInitialAuthor(), rie.getDisplayName(),
 				rie.getDescription(), false, locale, rie.importGetExportedFile(), null);
 			ScormEditController.setScormCPReference(re, getModuleConfiguration());
+		} else {
+			CPEditController.removeCPReference(getModuleConfiguration());
 		}
 	}
 
diff --git a/src/main/java/org/olat/course/nodes/WikiCourseNode.java b/src/main/java/org/olat/course/nodes/WikiCourseNode.java
index c5278adf8cf2caf41c324ac4e18555584c7b7c50..50a739843dd35f4a4fd03ad92a3ed7bc458e3bd0 100644
--- a/src/main/java/org/olat/course/nodes/WikiCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/WikiCourseNode.java
@@ -198,6 +198,8 @@ public class WikiCourseNode extends AbstractAccessableCourseNode {
 			RepositoryEntry re = handler.importResource(owner, rie.getInitialAuthor(), rie.getDisplayName(),
 				rie.getDescription(), false, locale, rie.importGetExportedFile(), null);
 			WikiEditController.setWikiRepoReference(re, getModuleConfiguration());
+		} else {
+			WikiEditController.removeWikiReference(getModuleConfiguration());
 		}
 	}