diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py
index 4486f662bb..1e75ba1f2d 100644
--- a/archinstall/lib/disk/device_handler.py
+++ b/archinstall/lib/disk/device_handler.py
@@ -318,6 +318,8 @@ def encrypt(
 
 		key_file = luks_handler.encrypt()
 
+		self.udev_sync()
+
 		luks_handler.unlock(key_file=key_file)
 
 		if not luks_handler.mapper_dev:
@@ -344,6 +346,8 @@ def format_encrypted(
 
 		key_file = luks_handler.encrypt()
 
+		self.udev_sync()
+
 		luks_handler.unlock(key_file=key_file)
 
 		if not luks_handler.mapper_dev:
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py
index 8673280bca..2cb407b4b6 100644
--- a/archinstall/lib/luks.py
+++ b/archinstall/lib/luks.py
@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import shlex
-import time
 from dataclasses import dataclass
 from pathlib import Path
 
@@ -135,10 +134,6 @@ def unlock(self, key_file: Path | None = None) -> None:
 
 		key_file = self._get_key_file(key_file)
 
-		wait_timer = time.time()
-		while Path(self.luks_dev_path).exists() is False and time.time() - wait_timer < 10:
-			time.sleep(0.025)
-
 		result = SysCommand(
 			'cryptsetup open '
 			f'{self.luks_dev_path} '