diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 7d97c7a5..738e34b8 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -866,6 +866,11 @@ wait_for_mount()
 
 dev_unit_name()
 {
+    if command -v systemd-escape >/dev/null; then
+        systemd-escape -p  "$1"
+        return
+    fi
+
     _name="${1%%/}"
     _name="${_name##/}"
     _name="$(str_replace "$_name" '-' '\x2d')"