diff --git a/rw_core/core/device/logical_agent.go b/rw_core/core/device/logical_agent.go
index 7a69722..966ab24 100644
--- a/rw_core/core/device/logical_agent.go
+++ b/rw_core/core/device/logical_agent.go
@@ -133,13 +133,12 @@
 		agent.logicalDevice = ld
 
 		// Setup the logicalports - internal processing, no need to propagate the client context
-		go func() {
-			subCtx := coreutils.WithSpanAndRPCMetadataFromContext(ctx)
-			err := agent.setupLogicalPorts(subCtx)
-			if err != nil {
-				logger.Errorw(ctx, "unable-to-setup-logical-ports", log.Fields{"error": err})
-			}
-		}()
+
+		err = agent.setupLogicalPorts(ctx)
+		if err != nil {
+			logger.Errorw(ctx, "unable-to-setup-logical-ports", log.Fields{"error": err})
+		}
+
 	} else {
 		// Check to see if we need to load from dB
 		ld = logicalDevice
@@ -172,12 +171,11 @@
 
 	// Setup the device routes. Building routes may fail if the pre-conditions are not satisfied (e.g. no PON ports present)
 	if logicalDeviceExist {
-		go func() {
-			subCtx := coreutils.WithSpanAndRPCMetadataFromContext(ctx)
-			if err := agent.buildRoutes(subCtx); err != nil {
-				logger.Warn(ctx, "routes-not-ready", log.Fields{"logical-device-id": agent.logicalDeviceID, "error": err})
-			}
-		}()
+
+		if err := agent.buildRoutes(ctx); err != nil {
+			logger.Warn(ctx, "routes-not-ready", log.Fields{"logical-device-id": agent.logicalDeviceID, "error": err})
+		}
+
 	}
 	startSucceeded = true