diff --git a/cmd/backoffice/fileserver.go b/cmd/backoffice/fileserver.go
index 9260dde..0480f8a 100644
--- a/cmd/backoffice/fileserver.go
+++ b/cmd/backoffice/fileserver.go
@@ -24,9 +24,10 @@ type FileServer struct {
 	storage actor.LogStorage[cart.CartGrain]
 }
 
-func NewFileServer(dataDir string) *FileServer {
+func NewFileServer(dataDir string, storage actor.LogStorage[cart.CartGrain]) *FileServer {
 	return &FileServer{
 		dataDir: dataDir,
+		storage: storage,
 	}
 }
 
diff --git a/cmd/backoffice/main.go b/cmd/backoffice/main.go
index 8a72597..dab72d7 100644
--- a/cmd/backoffice/main.go
+++ b/cmd/backoffice/main.go
@@ -29,8 +29,6 @@ func envOrDefault(key, def string) string {
 	return def
 }
 
-var globalDisk *actor.DiskStorage[cart.CartGrain]
-
 func startMutationConsumer(ctx context.Context, conn *amqp.Connection, hub *Hub) error {
 	ch, err := conn.Channel()
 	if err != nil {
@@ -82,9 +80,9 @@ func main() {
 	_ = os.MkdirAll(dataDir, 0755)
 
 	reg := cart.NewCartMultationRegistry()
-	globalDisk = actor.NewDiskStorage[cart.CartGrain](dataDir, reg)
+	diskStorage := actor.NewDiskStorage[cart.CartGrain](dataDir, reg)
 
-	fs := NewFileServer(dataDir)
+	fs := NewFileServer(dataDir, diskStorage)
 
 	hub := NewHub()
 	go hub.Run()