diff --git a/src/device/service/drivers/gnmi_openconfig/handlers/Interface.py b/src/device/service/drivers/gnmi_openconfig/handlers/Interface.py
index aba6f4aac1702ecf8609b1633f591b4b52dfc10e..03cfc6ff15e0490aee99be89c3ff1e9327dddf15 100644
--- a/src/device/service/drivers/gnmi_openconfig/handlers/Interface.py
+++ b/src/device/service/drivers/gnmi_openconfig/handlers/Interface.py
@@ -108,11 +108,12 @@ class InterfaceHandler(_Handler):
                 'name'         : interface_name,
                 'type'         : interface_type,
                 'mtu'          : interface_state['mtu'],
-                'ifindex'      : interface_state['ifindex'],
                 'admin-status' : interface_state['admin-status'],
                 'oper-status'  : interface_state['oper-status'],
                 'management'   : interface_state['management'],
             }
+            if not interface_state['management'] and 'ifindex' in interface_state:
+                _interface['ifindex'] = interface_state['ifindex']
             if 'description' in interface_config:
                 _interface['description'] = interface_config['description']
             if 'enabled' in interface_config: