diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 05465f3bdf..f047b8a043 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -274,8 +274,8 @@ (define (expand modules)
                                     keyboard-layout-variant))
                   (model   #$(and=> (xorg-configuration-keyboard-layout config)
                                     keyboard-layout-model))
-                  (options '#$(keyboard-layout-options
-                               (xorg-configuration-keyboard-layout config))))
+                  (options '#$(and=> (xorg-configuration-keyboard-layout config)
+                                     keyboard-layout-options)))
               (when layout
                 (display (input-class-section layout variant model options)
                          port)