diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index bfeb23ea6..1a389f4e6 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -345,7 +345,8 @@ def run():
                 _("No partitions are defined for <pre>{!s}</pre> to use.").format("mount"))
 
     # Find existing swap partitions that are part of the installation and enable them now
-    swap_devices = [p["device"] for p in partitions if (p["fs"] == "linuxswap" and p.get("claimed", False))]
+    swap_devices = [p["device"] for p in partitions if (p["fs"] == "linuxswap" and p.get("claimed", False) and p["fsName"] == "linuxswap")] \
+       + ["/dev/mapper/" + p["luksMapperName"] for p in partitions if (p["fs"] == "linuxswap" and p.get("claimed", False) and (p["fsName"] == "luks" or p["fsName"] == "luks2"))]
 
     enable_swap_partition(swap_devices)