diff --git a/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java b/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
index ddd9970..61ea43d 100644
--- a/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
@@ -115,7 +115,12 @@
     private void wipeOutLayouts() {
         print("Wiping UI layouts");
         UiTopoLayoutService service = get(UiTopoLayoutService.class);
-        service.getLayouts().forEach(service::removeLayout);
+        // wipe out all layouts except the default, which should always be there
+        service.getLayouts().forEach(l -> {
+            if (!l.id().isDefault()) {
+                service.removeLayout(l);
+            }
+        });
     }
 
     private void wipeOutRegions() {