diff --git a/espanso-detect/Cargo.toml b/espanso-detect/Cargo.toml
index 9f510a1..ae760fd 100644
--- a/espanso-detect/Cargo.toml
+++ b/espanso-detect/Cargo.toml
@@ -6,8 +6,6 @@ edition = "2018"
 build="build.rs"
 
 [features]
-# TODO: REMOVE!!!
-default = ["wayland"]
 # If the wayland feature is enabled, all X11 dependencies will be dropped
 # and only EVDEV-based methods will be supported.
 wayland = ["sctk"]
diff --git a/espanso-detect/src/evdev/mod.rs b/espanso-detect/src/evdev/mod.rs
index 6e4548a..2f87cf8 100644
--- a/espanso-detect/src/evdev/mod.rs
+++ b/espanso-detect/src/evdev/mod.rs
@@ -31,7 +31,7 @@ mod sync;
 use std::cell::RefCell;
 use std::collections::HashMap;
 
-use anyhow::Result;
+use anyhow::{Context as AnyhowContext, Result};
 use context::Context;
 use device::{get_devices, Device};
 use keymap::Keymap;
@@ -131,7 +131,9 @@ impl Source for EVDEVSource {
     let state = State::new(&keymap)?;
 
     info!("Querying modifier status...");
-    if let Some(modifiers_state) = sync::get_modifiers_state()? {
+    if let Some(modifiers_state) =
+      sync::get_modifiers_state().context("EVDEV modifier context state synchronization")?
+    {
       debug!("Updating device modifier state: {:?}", modifiers_state);
 
       for device in &mut self.devices {