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 0cd821f79..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,10 +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 != null) {
-				tableService.cleanFootnotesProTable();
-			}
 		}
 
 		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 d446788bb..171cd81b0 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
@@ -175,10 +175,6 @@ void removeDiffService(final TableCompareType compareType) {
 		}
 	}
 
-	void cleanFootnotesProTable() {
-		footnotesPerTable.clear();
-	}
-
 	private Table createDiffStateTable(final TableInfo tableInfo,
 			final IModelSession modelSession) {
 		final PlanPro2TableTransformationService modelService = getModelService(
@@ -685,9 +681,9 @@ public Set<TableInfo> getNonTransformableTables(
 				.collect(Collectors.toSet());
 	}
 
-	@SuppressWarnings("static-method")
 	void clearInstance() {
 		transformTableThreads.clear();
 		nonTransformableTables.clear();
+		footnotesPerTable.clear();
 	}
 }