diff --git a/patches/xenserver/etc/init.d/seteth1 b/patches/xenserver/etc/init.d/seteth1
index 4079472f79b..01ae5724950 100755
--- a/patches/xenserver/etc/init.d/seteth1
+++ b/patches/xenserver/etc/init.d/seteth1
@@ -50,9 +50,11 @@ setup_common() {
   if [ "$BOOTPROTO" == "static" ]
   then
     replace_in_file /etc/sysconfig/network GATEWAY $GW
-    if [ "$ETH2_IP" != "0.0.0.0" ]
+    if [ -n "$ETH2_IP" -a "$ETH2_IP" != "0.0.0.0" ]
     then
       replace_in_file /etc/sysconfig/network GATEWAYDEV "eth2"
+    else
+      sed -i /GATEWAYDEV/d /etc/sysconfig/network
     fi
   else
     sed -i /GATEWAY/d /etc/sysconfig/network