diff --git a/src/server_mgr_main.py b/src/server_mgr_main.py
index c44fdb36..3898deac 100755
--- a/src/server_mgr_main.py
+++ b/src/server_mgr_main.py
@@ -3283,9 +3283,9 @@ def get_control_ip(self, server):
     def get_control_gateway(self, server):
         control_intf = eval(self.get_control_interface(server))
         for key, value in control_intf.iteritems():
-            if 'gateway' in value:
+            if 'gateway' in value and len(value['gateway']):
                 return str(IPNetwork(value['gateway']).ip)
-        if 'gateway' in server:
+        if 'gateway' in server and len(server['gateway']):
             return str(IPNetwork(server['gateway']).ip)
         else:
             return ''