diff --git a/src/lib/inputleap/ClientApp.cpp b/src/lib/inputleap/ClientApp.cpp
index 3c620a1e..c3b8793d 100644
--- a/src/lib/inputleap/ClientApp.cpp
+++ b/src/lib/inputleap/ClientApp.cpp
@@ -435,7 +435,9 @@ ClientApp::mainLoop()
     // that.
     DAEMON_RUNNING(true);
 
-#if defined(MAC_OS_X_VERSION_10_7)
+// XXX: Creating a thread here is disabled, because it creates race
+//      conditions and segfaults.
+#if defined(MAC_OS_X_VERSION_10_7__NOPE)
 
     Thread thread([this](){ run_events_loop(); });