diff --git a/Ghidra/Processors/MC6800/data/languages/6x09.sinc b/Ghidra/Processors/MC6800/data/languages/6x09.sinc
index 881a824901..035e5ab4eb 100644
--- a/Ghidra/Processors/MC6800/data/languages/6x09.sinc
+++ b/Ghidra/Processors/MC6800/data/languages/6x09.sinc
@@ -1008,12 +1008,16 @@ macro PushEntireState()
 
 :LEAX EA    is op=0x30; EA
 {
-        X = EA;
+        local tmp = EA;
+        X = tmp;
+        $(Z) = (tmp == 0);
 }
 
 :LEAY EA    is op=0x31; EA
 {
-        Y = EA;
+        local tmp = EA;
+        Y = tmp;
+        $(Z) = (tmp == 0);
 }
 
 :LEAS EA    is op=0x32; EA