diff --git a/pyanaconda/modules/storage/partitioning/automatic/automatic_partitioning.py b/pyanaconda/modules/storage/partitioning/automatic/automatic_partitioning.py
index 3f20d243485..c464097a09b 100644
--- a/pyanaconda/modules/storage/partitioning/automatic/automatic_partitioning.py
+++ b/pyanaconda/modules/storage/partitioning/automatic/automatic_partitioning.py
@@ -149,9 +149,11 @@ def _clear_partitions(self, storage):
         # check but also here?
 
         # TODO maybe move to _configure_partitioning? Seems safer here.
-        self._remove_bootloader_partitions(storage)
         for mountpoint in self._request.removed_mount_points:
-            self._remove_mountpoint(storage, mountpoint)
+            if mountpoint == "bootloader":
+                self._remove_bootloader_partitions(storage)
+            else:
+                self._remove_mountpoint(storage, mountpoint)
         for mountpoint in self._request.erased_mount_points:
             self._erase_mountpoint(storage, mountpoint)