diff --git a/router-daemon/pvcrd/VXNetworkInstance.py b/router-daemon/pvcrd/VXNetworkInstance.py
index 7323f2f1..fc666f8f 100644
--- a/router-daemon/pvcrd/VXNetworkInstance.py
+++ b/router-daemon/pvcrd/VXNetworkInstance.py
@@ -79,9 +79,10 @@ class VXNetworkInstance():
         @zk_conn.DataWatch('/networks/{}/ip_gateway'.format(self.vni))
         def watch_network_gateway(data, stat, event=''):
             if data and self.ip_gateway != data.decode('ascii'):
+                orig_gateway = self.ip_gateway
                 self.ip_gateway = data.decode('ascii')
                 if self.this_router.network_state == 'primary':
-                    if self.ip_gateway:
+                    if orig_gateway:
                         self.removeGatewayAddress()
                     self.createGatewayAddress()