diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java
index 54808b375..82b3f75f9 100644
--- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java
+++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceContextFunction.java
@@ -199,9 +199,6 @@ public void handleEvent(final Event event) {
 					.getCacheService()
 					.getCache(schnitstelle,
 							ToolboxConstants.CacheId.DIRECTED_EDGE_TO_SUBPATH));
-			if (event.getTopic().equals(Events.MODEL_CHANGED)) {
-				tableService.cleanWorkNotesProTable();
-			}
 		}
 
 		if (event.getTopic().equals(Events.CLOSE_SESSION)) {
diff --git a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java
index 169463324..3ae699e25 100644
--- a/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java
+++ b/java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/internal/TableServiceImpl.java
@@ -183,10 +183,6 @@ void removeDiffService(final TableCompareType compareType) {
 		}
 	}
 
-	void cleanWorkNotesProTable() {
-		workNotesPerTable.clear();
-	}
-
 	private Table createDiffTable(final TableInfo tableInfo,
 			final IModelSession modelSession, final String controlAreaId) {
 
@@ -822,9 +818,9 @@ public Set<TableInfo> getNonTransformableTables(
 				.collect(Collectors.toSet());
 	}
 
-	@SuppressWarnings("static-method")
 	void clearInstance() {
 		transformTableThreads.clear();
 		nonTransformableTables.clear();
+		workNotesPerTable.clear();
 	}
 }