diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 5c4b8c3a9a1..45d518e73f7 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -16,11 +16,13 @@ in
     programs.ssh = {
 
       forwardX11 = mkOption {
-        default = cfgd.forwardX11;
+        default = false;
         description = ''
           Whether to request X11 forwarding on outgoing connections by default.
           This is useful for running graphical programs on the remote machine and have them display to your local X11 server.
           Historically, this value has depended on the value used by the local sshd daemon, but there really isn't a relation between the two.
+          Warning: never enable X11 forwarding unless you are connecting to a machine you trust!
+          To enable or disable forwarding on a per-connection basis, see the -X and -x options to ssh.
         '';
       };