diff --git a/xwords4/wince/Makefile b/xwords4/wince/Makefile
index 2d35468a1..44581f37a 100644
--- a/xwords4/wince/Makefile
+++ b/xwords4/wince/Makefile
@@ -56,7 +56,7 @@ HAVE_COMMCTRL = 1
 
 ifeq ($(TARGET_OS),wince)
 #SMS = -DXWFEATURE_SMS
-RELAY = -DXWFEATURE_RELAY -DCOMMS_HEARTBEAT -DRELAY_NOEDIT_ADDR
+RELAY = -DXWFEATURE_RELAY -DCOMMS_HEARTBEAT
 # IPDIRECT = -DXWFEATURE_IP_DIRECT
 # BLUETOOTH = -DXWFEATURE_BLUETOOTH
 CC = ${CE_ARCH}-gcc
@@ -91,7 +91,7 @@ ifeq ($(TARGET_OS),win32)
 STANDALONE = -DPREV_WAS_STANDALONE_ONLY
 #BLUETOOTH = -DXWFEATURE_BLUETOOTH
 #SMS = -DXWFEATURE_SMS
-RELAY = -DXWFEATURE_RELAY -DRELAY_NOEDIT_ADDR
+RELAY = -DXWFEATURE_RELAY
 # IPDIRECT = -DXWFEATURE_IP_DIRECT
 CC = i586-mingw32msvc-gcc
 WINDRES = i586-mingw32msvc-windres
@@ -104,6 +104,13 @@ CFLAGS += -DCANT_DO_CMDBAR -DDRAW_LINK_DIRECT -DXWFEATURE_TURNCHANGENOTIFY
 endif
 endif
 
+
+ifdef RELAY
+ifneq ($(DEBUG),TRUE)
+	RELAY += -DRELAY_NOEDIT_ADDR
+endif
+endif
+
 # CFLAGS += -DFORCE_SCROLL=3
 CFLAGS += -DARM -I./ -I../common -I../relay