diff --git a/modules/xsession.nix b/modules/xsession.nix
index 6dc2968a6..b79c81c47 100644
--- a/modules/xsession.nix
+++ b/modules/xsession.nix
@@ -114,7 +114,7 @@ in {
                 args = optional (layout != null) "-layout '${layout}'"
                   ++ optional (variant != null) "-variant '${variant}'"
                   ++ optional (model != null) "-model '${model}'"
-                  ++ map (v: "-option '${v}'") options;
+                  ++ [ "-option ''" ] ++ map (v: "-option '${v}'") options;
               in "${pkgs.xorg.setxkbmap}/bin/setxkbmap ${toString args}";
           };
         };
diff --git a/tests/modules/misc/xsession/basic-setxkbmap-expected.service b/tests/modules/misc/xsession/basic-setxkbmap-expected.service
index 39f876dd6..980721171 100644
--- a/tests/modules/misc/xsession/basic-setxkbmap-expected.service
+++ b/tests/modules/misc/xsession/basic-setxkbmap-expected.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-ExecStart=@setxkbmap@/bin/setxkbmap -layout 'us' -variant ''
+ExecStart=@setxkbmap@/bin/setxkbmap -layout 'us' -variant '' -option ''
 RemainAfterExit=true
 Type=oneshot
 
diff --git a/tests/modules/misc/xsession/keyboard-without-layout-expected.service b/tests/modules/misc/xsession/keyboard-without-layout-expected.service
index a04af53da..4dbc10045 100644
--- a/tests/modules/misc/xsession/keyboard-without-layout-expected.service
+++ b/tests/modules/misc/xsession/keyboard-without-layout-expected.service
@@ -2,7 +2,7 @@
 WantedBy=graphical-session.target
 
 [Service]
-ExecStart=@setxkbmap@/bin/setxkbmap -option 'ctrl:nocaps' -option 'altwin:no_win'
+ExecStart=@setxkbmap@/bin/setxkbmap -option '' -option 'ctrl:nocaps' -option 'altwin:no_win'
 RemainAfterExit=true
 Type=oneshot