diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
index 89ecff808b..fdc9964e6e 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
@@ -233,6 +233,8 @@ id _lastServerWithOSKShowing = nil;
     if (_kvk != nil && (_alwaysShowOSK || _lastServerWithOSKShowing == newServer)) {
         [self showOSK];
     }
+
+    _lastServerWithOSKShowing = nil;
 }
 
 CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon) {