diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
index 6a96520921c..ba592c7ce6c 100644
--- a/units/systemd-ask-password-plymouth.path
+++ b/units/systemd-ask-password-plymouth.path
@@ -10,6 +10,7 @@ Description=Forward Password Requests to Plymouth Directory Watch
 DefaultDependencies=no
 Conflicts=shutdown.target systemd-ask-password-console.path systemd-ask-password-console.service
 Before=basic.target shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Path]
 DirectoryNotEmpty=/run/systemd/ask-password
diff --git a/units/systemd-ask-password-plymouth.service.in b/units/systemd-ask-password-plymouth.service.in
index a7cd451aed5..2e071bdc861 100644
--- a/units/systemd-ask-password-plymouth.service.in
+++ b/units/systemd-ask-password-plymouth.service.in
@@ -10,6 +10,7 @@ Description=Forward Password Requests to Plymouth
 DefaultDependencies=no
 Conflicts=shutdown.target systemd-ask-password-console.path systemd-ask-password-console.service
 Before=shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth