diff --git a/src/main/java/de/bps/course/nodes/LLCourseNode.java b/src/main/java/de/bps/course/nodes/LLCourseNode.java
index 56e84b96b4f1a1803363e33a5f6ab9949123df6c..01ba62be6c7bebe88dd12dbf9eadfa31b4e906d8 100644
--- a/src/main/java/de/bps/course/nodes/LLCourseNode.java
+++ b/src/main/java/de/bps/course/nodes/LLCourseNode.java
@@ -72,23 +72,20 @@ public class LLCourseNode extends AbstractAccessableCourseNode {
 
 	public LLCourseNode(INode parent) {
 		super(TYPE, parent);
-		initDefaultConfig();
 	}
-
-	private void initDefaultConfig() {
+	
+	@Override
+	public void updateModuleConfigDefaults(boolean isNewNode, INode parent) {
 		ModuleConfiguration config = getModuleConfiguration();
-		// add an empty link entry as default if none existent
-		if (config.get(CONF_LINKLIST) == null) {
+		
+		if (isNewNode) {
 			List<LLModel> initialList = new ArrayList<>(1);
 			initialList.add(new LLModel());
 			config.set(CONF_LINKLIST, initialList);
 		}
-	}
-	
-	@Override
-	public void updateModuleConfigDefaults(boolean isNewNode, INode parent) {
-		ModuleConfiguration config = getModuleConfiguration();
+		
 		if(config.getConfigurationVersion() < 2) {
+			@SuppressWarnings("unchecked")
 			List<LLModel> links = (List<LLModel>)config.get(CONF_LINKLIST);
 			for(LLModel link:links) {
 				String linkValue = link.getTarget();