diff --git a/mpsd-software.py b/mpsd-software.py
index c8f1ead1615d2d7820fe24c8a99bf8c9beb11911..122bfa3d0295755866fb798273f9ed4e3d1d8408 100755
--- a/mpsd-software.py
+++ b/mpsd-software.py
@@ -1001,7 +1001,8 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
         if force_remove or input().lower() == "y":
             folders_to_remove = os.listdir(root_dir / mpsd_release)
             # skip logs folder
-            folders_to_remove.remove("logs")
+            if "logs" in folders_to_remove:
+                folders_to_remove.remove("logs")
             for folder in folders_to_remove:
                 shutil.rmtree(root_dir / mpsd_release / folder)
                 sys.exit(0)