diff --git a/source/src/SGCP.c b/source/src/SGCP.c
index 9ef9106..2c0f234 100644
--- a/source/src/SGCP.c
+++ b/source/src/SGCP.c
@@ -937,6 +937,8 @@ static void GWRevHandler(void)
 	
 	switch(SGCP.GWRS485Rx.rCmdGWToMD) {	
 		case GWTOMD_CMD_LOGIN:{
+			if(is_all_byte(GFHeader->GWAddr, sizeof(GFHeader->GWAddr), 0x00) == true)
+				return;
 			SGCP.LoginOk = PayLoad[0];
 			if(SGCP.LoginOk == true)
 			{