diff --git a/Kieker.WebGUI/lib/kieker-1.6-SNAPSHOT_emf.jar b/Kieker.WebGUI/lib/kieker-1.6-SNAPSHOT_emf.jar
index 33fdb36f47c2c25a769b05f2af7de1c507d9cd2c..a604ad9d242420b7e6b70965f194bc5df3f95201 100644
Binary files a/Kieker.WebGUI/lib/kieker-1.6-SNAPSHOT_emf.jar and b/Kieker.WebGUI/lib/kieker-1.6-SNAPSHOT_emf.jar differ
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java
index 2ffbf42f4f40524293b0f156e3e32ab37aff522a..45254fd746c9c6ce94fce34ff1df31b8fcaafbc3 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java
@@ -863,6 +863,8 @@ public final class CurrentAnalysisEditorBean {
 				conn.getOutputPort().setRepository(null);
 			}
 
+			this.repositoryMap.remove(repository);
+
 			if (this.selectedRepository == repository) {
 				this.selectedRepository = null; // NOPMD
 			}
@@ -901,7 +903,17 @@ public final class CurrentAnalysisEditorBean {
 				}
 			}
 			this.filter2repositoryConnections.removeAll(fRDelList);
+			this.pluginMap.remove(plugin);
 
+			// Remove the ports from the registry
+			for (final MIPort mPort : plugin.getOutputPorts()) {
+				this.portMap.remove(mPort);
+			}
+			if (plugin instanceof MIFilter) {
+				for (final MIPort mPort : ((MIFilter) plugin).getInputPorts()) {
+					this.portMap.remove(mPort);
+				}
+			}
 			if (this.selectedPlugin == plugin) {
 				this.selectedPlugin = null; // NOPMD
 			}