diff --git a/options/custom/desktops/hyprland/default.nix b/options/custom/desktops/hyprland/default.nix
index 1f6a5a8..37e3af6 100644
--- a/options/custom/desktops/hyprland/default.nix
+++ b/options/custom/desktops/hyprland/default.nix
@@ -31,6 +31,7 @@ in {
       };
 
       programs = {
+        polkit.agent = true;
         uwsm.enable = true;
       };
     };
diff --git a/options/custom/desktops/niri/default.nix b/options/custom/desktops/niri/default.nix
index 1a8a8f8..0387b05 100644
--- a/options/custom/desktops/niri/default.nix
+++ b/options/custom/desktops/niri/default.nix
@@ -35,6 +35,11 @@ in {
         };
       };
 
+      programs = {
+        # Enable custom polkit agent
+        polkit.agent = !cfg.polkit;
+      };
+
       services = {
         # Enable rootless Xwayland
         xwayland-satellite.enable = cfg.xwayland;
diff --git a/options/custom/programs/polkit.nix b/options/custom/programs/polkit.nix
index bd1419e..67fe1d3 100644
--- a/options/custom/programs/polkit.nix
+++ b/options/custom/programs/polkit.nix
@@ -11,7 +11,7 @@ with lib; let
 in {
   options.custom.programs.polkit = {
     enable = mkOption {default = false;};
-    agent = mkOption {default = true;};
+    agent = mkOption {default = false;};
     bypass = mkOption {default = false;};
   };