diff --git a/tools/upmap/upmap-remapped.py b/tools/upmap/upmap-remapped.py
index 489541d..e40f4d9 100755
--- a/tools/upmap/upmap-remapped.py
+++ b/tools/upmap/upmap-remapped.py
@@ -233,4 +233,6 @@ def rm_upmap_pg_items(pgid):
   num += 1
 
 print(r'wait; sleep 4; while ceph status | grep -q "peering\|activating\|laggy"; do sleep 2; done')
-cluster.shutdown()
+
+if not use_shell:
+  cluster.shutdown()