diff --git a/rw_core/core/device/agent_port.go b/rw_core/core/device/agent_port.go
index 937c46c..baa74ac 100644
--- a/rw_core/core/device/agent_port.go
+++ b/rw_core/core/device/agent_port.go
@@ -82,14 +82,11 @@
 				// Notify the logical device manager to change the port state
 				// Do this for NNI and UNIs only. PON ports are not known by logical device
 				if newPort.Type == voltha.Port_ETHERNET_NNI || newPort.Type == voltha.Port_ETHERNET_UNI {
-					subCtx := coreutils.WithSpanAndRPCMetadataFromContext(ctx)
+					if err := agent.deviceMgr.logicalDeviceMgr.updatePortState(ctx, agent.deviceID, portID, operStatus); err != nil {
+						// TODO: VOL-2707
+						logger.Warnw(ctx, "unable-to-update-logical-port-state", log.Fields{"error": err})
+					}
 
-					go func(portID uint32, ctx context.Context) {
-						if err := agent.deviceMgr.logicalDeviceMgr.updatePortState(ctx, agent.deviceID, portID, operStatus); err != nil {
-							// TODO: VOL-2707
-							logger.Warnw(ctx, "unable-to-update-logical-port-state", log.Fields{"error": err})
-						}
-					}(portID, subCtx)
 				}
 			}
 			portHandle.Unlock()