diff --git a/rw_core/core/device/logical_manager.go b/rw_core/core/device/logical_manager.go
index 9f03746..8fe04a9 100644
--- a/rw_core/core/device/logical_manager.go
+++ b/rw_core/core/device/logical_manager.go
@@ -169,16 +169,11 @@
 		return nil, err
 	}
 
-	go func() {
-		//TODO: either wait for the agent to be started before returning, or
-		//      implement locks in the agent to ensure request are not processed before start() is complete
-		ldCtx := utils.WithSpanAndRPCMetadataFromContext(ctx)
-		err := agent.start(ldCtx, false, nil)
-		if err != nil {
-			logger.Errorw(ctx, "unable-to-create-the-logical-device", log.Fields{"error": err})
-			ldMgr.deleteLogicalDeviceAgent(id)
-		}
-	}()
+	err := agent.start(ctx, false, nil)
+	if err != nil {
+		logger.Errorw(ctx, "unable-to-create-the-logical-device", log.Fields{"error": err})
+		ldMgr.deleteLogicalDeviceAgent(id)
+	}
 
 	logger.Debug(ctx, "creating-logical-device-ends")
 	return &id, nil