diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index e31cb4c5a24e7..3a6c759ad1ad8 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -92,9 +92,10 @@ stdenv.mkDerivation rec {
     patchelf --replace-needed libpcap.so.0.8 ${libpcap}/lib/libpcap.so $out/bin/warp-dex
     mv lib/systemd/system $out/lib/systemd/
     substituteInPlace $out/lib/systemd/system/warp-svc.service \
-      --replace "ExecStart=" "ExecStart=$out"
+      --replace-fail "ExecStart=" "ExecStart=$out"
     substituteInPlace $out/lib/systemd/user/warp-taskbar.service \
-      --replace "ExecStart=" "ExecStart=$out"
+      --replace-fail "ExecStart=" "ExecStart=$out" \
+      --replace-fail "BindsTo=" "PartOf="
 
     cat >>$out/lib/systemd/user/warp-taskbar.service <<EOF