diff --git a/devstack/tools/nsxp_cleanup.py b/devstack/tools/nsxp_cleanup.py
index 67b977f8b4..bed62f78b4 100755
--- a/devstack/tools/nsxp_cleanup.py
+++ b/devstack/tools/nsxp_cleanup.py
@@ -154,6 +154,11 @@ class NSXClient(object):
         for rtr in routers:
             # remove all nat rules from this router before deletion
             self.cleanup_tier1_nat_rules(rtr['id'])
+            try:
+                self.nsxpolicy.tier1.remove_edge_cluster(rtr['id'])
+            except exceptions.ManagerError as e:
+                # Not always exists
+                pass
             try:
                 self.nsxpolicy.tier1.delete(rtr['id'])
             except exceptions.ManagerError as e: