diff --git a/src/ca65/ea.h b/src/ca65/ea.h
index d861e9a6c..487027c02 100644
--- a/src/ca65/ea.h
+++ b/src/ca65/ea.h
@@ -43,6 +43,10 @@
 /*****************************************************************************/
 
 
+/* EffAddr Flags */
+#define EFFADDR_OVERRIDE_ZP     0x00000001UL
+
+
 
 /* GetEA result struct */
 typedef struct EffAddr EffAddr;
@@ -51,6 +55,7 @@ struct EffAddr {
     unsigned long       AddrModeSet;    /* Possible addressing modes */
     struct ExprNode*    Expr;           /* Expression if any (NULL otherwise) */
     unsigned            Reg;            /* Register number in sweet16 mode */
+    unsigned long       Flags;          /* Other properties */
 
     /* The following fields are used inside instr.c */
     unsigned            AddrMode;       /* Actual addressing mode used */
diff --git a/src/ca65/ea65.c b/src/ca65/ea65.c
index 275d90b56..5bd2ba82b 100644
--- a/src/ca65/ea65.c
+++ b/src/ca65/ea65.c
@@ -72,11 +72,13 @@ void GetEA (EffAddr* A)
     /* Clear the output struct */
     A->AddrModeSet = 0;
     A->Expr = 0;
+    A->Flags = 0;
 
     /* Handle an addressing size override */
     switch (CurTok.Tok) {
         case TOK_OVERRIDE_ZP:
             Restrictions = AM65_DIR | AM65_DIR_X | AM65_DIR_Y;
+            A->Flags |= EFFADDR_OVERRIDE_ZP;
             NextTok ();
             break;
 
diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 4f95ec75c..89162c3c6 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -1269,7 +1269,8 @@ static int EvalEA (const InsDesc* Ins, EffAddr* A)
         ExprNode* Left = A->Expr->Left;
         if ((A->Expr->Op == EXPR_BYTE0 || A->Expr->Op == EXPR_BYTE1) &&
             Left->Op == EXPR_SYMBOL                                  &&
-            GetSymAddrSize (Left->V.Sym) != ADDR_SIZE_ZP) {
+            GetSymAddrSize (Left->V.Sym) != ADDR_SIZE_ZP             &&
+            !(A->Flags & EFFADDR_OVERRIDE_ZP)) {
 
             /* Output a warning */
             Warning (1, "Suspicious address expression");