diff --git a/bundles/systemd-swap/items.py b/bundles/systemd-swap/items.py
index 9f0e66a..fae6b76 100644
--- a/bundles/systemd-swap/items.py
+++ b/bundles/systemd-swap/items.py
@@ -4,14 +4,23 @@ assert isinstance(size, int)
 actions = {
     'stop_swap': {
         'command': f'systemctl stop swapfile.swap',
-        'unless': f'rm /swapfile',
+        'unless': f'! systemctl is-active swapfile.swap',
         'triggered': True,
     },
+    'remove_swapfile': {
+        'command': f'rm /swapfile',
+        'unless': f'! test -e /swapfile',
+        'triggered': True,
+        'needs': {
+            'action:stop_swap',
+        },
+    },
     'create_swapfile': {
         'command': f'dd if=/dev/zero of=/swapfile bs={size} count=1',
         'unless': f'stat -c %s /swapfile | grep ^{size}$',
         'preceded_by': {
             'action:stop_swap',
+            'action:remove_swapfile',
         },
         'triggers': {
             'action:initialize_swapfile',