diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
index 2f5fe3b27a..237763dec1 100644
--- a/native/Avalonia.Native/src/OSX/AvnView.mm
+++ b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -461,10 +461,10 @@
     auto timestamp = static_cast<uint64_t>([event timestamp] * 1000);
     auto modifiers = [self getModifiers:[event modifierFlags]];
 
-    if(!_lastKeyConsumeByInputContext || key <= 32){
+    if(!_lastKeyConsumeByInputContext){
         auto handled = _parent->BaseEvents->RawKeyEvent(type, timestamp, modifiers, key, physicalKey, keySymbolUtf8);
         
-        if(key > 32 && type == KeyDown && !handled){
+        if(type == KeyDown && !handled && keySymbolUtf8 != NULL){
             _parent->BaseEvents->RawTextInputEvent(timestamp, keySymbolUtf8);
         }
     }