diff --git a/ziti-controller/subcmd/run.go b/ziti-controller/subcmd/run.go
index 021e76185..9ea61540d 100644
--- a/ziti-controller/subcmd/run.go
+++ b/ziti-controller/subcmd/run.go
@@ -18,10 +18,10 @@ package subcmd
 
 import (
 	"fmt"
-	"github.com/openziti/ziti/common/version"
-	"github.com/openziti/ziti/ziti/agent"
 	"github.com/openziti/edge/controller/server"
 	"github.com/openziti/fabric/controller"
+	"github.com/openziti/ziti/common/version"
+	"github.com/openziti/ziti/ziti/agent"
 	"github.com/spf13/cobra"
 )
 
@@ -45,7 +45,7 @@ func run(cmd *cobra.Command, args []string) {
 		}
 
 		var c *controller.Controller
-		if c, err = controller.NewController(config,  version.GetCmdBuildInfo()); err != nil {
+		if c, err = controller.NewController(config, version.GetCmdBuildInfo()); err != nil {
 			fmt.Printf("unable to create fabric controller %+v\n", err)
 			panic(err)
 		}
@@ -57,8 +57,9 @@ func run(cmd *cobra.Command, args []string) {
 		}
 
 		ec.SetHostController(c)
+		ec.Initialize()
 
-		go ec.InitAndRun()
+		go ec.RunAndWait()
 
 		if err = c.Run(); err != nil {
 			panic(err)