diff --git a/modules/services/cliphist.nix b/modules/services/cliphist.nix
index e7dc8e998..e04dd3bd0 100644
--- a/modules/services/cliphist.nix
+++ b/modules/services/cliphist.nix
@@ -61,7 +61,8 @@ in {
     systemd.user.services.cliphist = {
       Unit = {
         Description = "Clipboard management daemon";
-        PartOf = [ "graphical-session.target" ];
+        PartOf = lib.toList cfg.systemdTargets;
+        After = lib.toList cfg.systemdTargets;
       };
 
       Service = {
@@ -77,7 +78,8 @@ in {
     systemd.user.services.cliphist-images = lib.mkIf cfg.allowImages {
       Unit = {
         Description = "Clipboard management daemon - images";
-        PartOf = [ "graphical-session.target" ];
+        PartOf = lib.toList cfg.systemdTargets;
+        After = lib.toList cfg.systemdTargets;
       };
 
       Service = {