diff --git a/playbooks/Linux.yaml b/playbooks/Linux.yaml
index 695cf24..7e8b116 100644
--- a/playbooks/Linux.yaml
+++ b/playbooks/Linux.yaml
@@ -13,9 +13,3 @@
     - role: gnome-shell
       when: "'GNOME' in ansible_env.XDG_CURRENT_DESKTOP"
     - role: xremap
-      when: >
-        'GNOME' in ansible_env.XDG_CURRENT_DESKTOP and
-        ansible_env.XDG_SESSION_TYPE == 'wayland' and (
-            ansible_os_family == "RedHat" or
-            ansible_os_family == "Debian"
-        )
diff --git a/roles/xremap/tasks/main.yaml b/roles/xremap/tasks/main.yaml
index d0a97c4..beedc42 100644
--- a/roles/xremap/tasks/main.yaml
+++ b/roles/xremap/tasks/main.yaml
@@ -1,8 +1,11 @@
 ---
 - assert:
     that: >
-      'GNOME' in ansible_env.XDG_CURRENT_DESKTOP and
-      ansible_env.XDG_SESSION_TYPE == 'wayland'
+      'XDG_CURRENT_DESKTOP' in ansible_env and
+      'GNOME' in ansible_env.XDG_CURRENT_DESKTOP and (
+        ansible_env.XDG_SESSION_TYPE == 'wayland' or
+        ansible_env.XDG_SESSION_TYPE == 'x11'
+      )
 
 - set_fact:
     install_dir: '{{ansible_env.HOME}}/.local/bin'