diff --git a/messaging/autosetup.go b/messaging/autosetup.go
new file mode 100644
index 000000000..64f179cfe
--- /dev/null
+++ b/messaging/autosetup.go
@@ -0,0 +1,17 @@
+package messaging
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+
+	"github.com/cortezaproject/corteza-server/messaging/internal/service"
+	"github.com/cortezaproject/corteza-server/pkg/cli"
+)
+
+func accessControlSetup(ctx context.Context, cmd *cobra.Command, c *cli.Config) error {
+	// Calling grant directly on internal permissions service to avoid AC check for "grant"
+	var p = service.DefaultPermissions
+	var ac = service.DefaultAccessControl
+	return p.Grant(ctx, ac.Whitelist(), ac.DefaultRules()...)
+}
diff --git a/messaging/messaging.go b/messaging/messaging.go
index 2fe044bba..8d9fd52b9 100644
--- a/messaging/messaging.go
+++ b/messaging/messaging.go
@@ -24,13 +24,6 @@ func Configure() *cli.Config {
 	var (
 		// Websocket handler
 		ws *websocket.Websocket
-
-		accessControlSetup = func(ctx context.Context, cmd *cobra.Command, c *cli.Config) error {
-			// Calling grant directly on internal permissions service to avoid AC check for "grant"
-			var p = service.DefaultPermissions
-			var ac = service.DefaultAccessControl
-			return p.Grant(ctx, ac.Whitelist(), ac.DefaultRules()...)
-		}
 	)
 
 	return &cli.Config{