diff --git a/tasks/swap.yml b/tasks/swap.yml
index 8dccfb6..ff80d44 100644
--- a/tasks/swap.yml
+++ b/tasks/swap.yml
@@ -6,18 +6,23 @@
     state: present
     reload: yes
 
+- name: swap | Gather active swaps
+  command: swapon --noheadings --show=NAME
+  register: active_swaps
+  changed_when: false
+
 - name: swap | Disable swap if host has enough RAM
   ansible.builtin.command: swapoff -a
   when:
     - proxmox_disable_swap
     - ansible_memtotal_mb >= proxmox_min_ram_mb_for_no_swap
-  changed_when: false
+    - active_swaps.stdout != ""
 
-- name: swap | Remove swap from fstab
+- name: swap | Comment swap entries in fstab
   ansible.builtin.replace:
     path: /etc/fstab
-    regexp: '^\S+\s+\S+\s+swap\s+.*$'
-    replace: ''
+    regexp: '^(\s*)(?!#)(\S+\s+\S+\s+swap\s+.*)$'
+    replace: '\1# \2'
   when:
     - proxmox_disable_swap
     - ansible_memtotal_mb >= proxmox_min_ram_mb_for_no_swap