diff --git a/js/app/map/system.js b/js/app/map/system.js
index b6187040..df4fcfb6 100644
--- a/js/app/map/system.js
+++ b/js/app/map/system.js
@@ -699,9 +699,8 @@ define([
                 $(tabContentElement).trigger('pf:removeSystemModules');
             }
 
-            // remove endpoints and their connections
-            // do not fire a "connectionDetached" event
-            map.detachAllConnections(system, {fireEvent: false});
+            // remove connections do not fire a "connectionDetached" event
+            map.deleteConnectionsForElement(system, {fireEvent: false});
 
             // destroy tooltip/popover
             system.toggleSystemTooltip('destroy', {});
diff --git a/public/js/v1.5.2/app/map/system.js b/public/js/v1.5.2/app/map/system.js
index b6187040..df4fcfb6 100644
--- a/public/js/v1.5.2/app/map/system.js
+++ b/public/js/v1.5.2/app/map/system.js
@@ -699,9 +699,8 @@ define([
                 $(tabContentElement).trigger('pf:removeSystemModules');
             }
 
-            // remove endpoints and their connections
-            // do not fire a "connectionDetached" event
-            map.detachAllConnections(system, {fireEvent: false});
+            // remove connections do not fire a "connectionDetached" event
+            map.deleteConnectionsForElement(system, {fireEvent: false});
 
             // destroy tooltip/popover
             system.toggleSystemTooltip('destroy', {});