diff --git a/ocis-pkg/sync/trap.go b/ocis-pkg/sync/trap.go
index c7c0e8bbe..13eb08a47 100644
--- a/ocis-pkg/sync/trap.go
+++ b/ocis-pkg/sync/trap.go
@@ -16,7 +16,6 @@ func Trap(gr *run.Group, cancel context.CancelFunc) {
 		<-stop
 		return nil
 	}, func(err error) {
-		close(stop)
 		cancel()
 	})
 }
diff --git a/storage/pkg/command/authbasic.go b/storage/pkg/command/authbasic.go
index 249781c44..3e0d11db4 100644
--- a/storage/pkg/command/authbasic.go
+++ b/storage/pkg/command/authbasic.go
@@ -78,7 +78,7 @@ func AuthBasic(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.AuthBasic.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/authbearer.go b/storage/pkg/command/authbearer.go
index 9a8e4a9aa..d15b726fc 100644
--- a/storage/pkg/command/authbearer.go
+++ b/storage/pkg/command/authbearer.go
@@ -73,7 +73,7 @@ func AuthBearer(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.AuthBearer.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
index 935f23e20..70e9dbe3c 100644
--- a/storage/pkg/command/gateway.go
+++ b/storage/pkg/command/gateway.go
@@ -96,7 +96,7 @@ func Gateway(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.Gateway.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/groups.go b/storage/pkg/command/groups.go
index fb631674b..3670aa79a 100644
--- a/storage/pkg/command/groups.go
+++ b/storage/pkg/command/groups.go
@@ -84,7 +84,7 @@ func Groups(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.Groups.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go
index 519c4a387..08958b058 100644
--- a/storage/pkg/command/sharing.go
+++ b/storage/pkg/command/sharing.go
@@ -92,7 +92,7 @@ func Sharing(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.Sharing.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/storagehome.go b/storage/pkg/command/storagehome.go
index 0b5ad9300..3eb886f06 100644
--- a/storage/pkg/command/storagehome.go
+++ b/storage/pkg/command/storagehome.go
@@ -86,7 +86,7 @@ func StorageHome(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.StorageHome.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/storagepubliclink.go b/storage/pkg/command/storagepubliclink.go
index 75922f590..87ca7e3ff 100644
--- a/storage/pkg/command/storagepubliclink.go
+++ b/storage/pkg/command/storagepubliclink.go
@@ -68,7 +68,7 @@ func StoragePublicLink(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.StoragePublicLink.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/storageusers.go b/storage/pkg/command/storageusers.go
index 68a63637c..e39df93cd 100644
--- a/storage/pkg/command/storageusers.go
+++ b/storage/pkg/command/storageusers.go
@@ -86,7 +86,7 @@ func StorageUsers(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.StorageUsers.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/users.go b/storage/pkg/command/users.go
index e264c5782..f087c9a56 100644
--- a/storage/pkg/command/users.go
+++ b/storage/pkg/command/users.go
@@ -85,7 +85,7 @@ func Users(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.Users.Supervised {
 				sync.Trap(&gr, cancel)
 			}