diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py
index a7194fb42f..c00ef5806b 100644
--- a/archinstall/lib/luks.py
+++ b/archinstall/lib/luks.py
@@ -126,7 +126,7 @@ def _get_luks_uuid(self) -> str:
 			raise err
 
 	def is_unlocked(self) -> bool:
-		return self.mapper_name is not None and Path(f'/dev/mapper/{self.mapper_name}').exists()
+		return (mapper_dev := self.mapper_dev) is not None and mapper_dev.is_symlink()
 
 	def unlock(self, key_file: Path | None = None) -> None:
 		"""
@@ -157,7 +157,7 @@ def unlock(self, key_file: Path | None = None) -> None:
 
 		debug(f'cryptsetup open output: {result.stdout.decode().rstrip()}')
 
-		if not self.mapper_dev or not self.mapper_dev.is_symlink():
+		if not self.is_unlocked():
 			raise DiskError(f'Failed to open luks2 device: {self.luks_dev_path}')
 
 	def lock(self) -> None: