diff --git a/src/autotype/x11/AutoTypeX11.cpp b/src/autotype/x11/AutoTypeX11.cpp
index d2d3acf0e..80a9d523f 100644
--- a/src/autotype/x11/AutoTypeX11.cpp
+++ b/src/autotype/x11/AutoTypeX11.cpp
@@ -59,7 +59,9 @@ AutoTypePlatformX11::AutoTypePlatformX11()
 void AutoTypePlatformX11::unload()
 {
     // Restore the KeyboardMapping to its original state.
-    AddKeysym(NoSymbol);
+    if (m_currentRemapKeysym != NoSymbol) {
+        AddKeysym(NoSymbol);
+    }
 
     if (m_keysymTable) {
         XFree(m_keysymTable);