diff --git a/storage/pkg/command/storagedrivers/metadata.go b/storage/pkg/command/storagedrivers/metadata.go
index 1fc9aa3b366..64007538cee 100644
--- a/storage/pkg/command/storagedrivers/metadata.go
+++ b/storage/pkg/command/storagedrivers/metadata.go
@@ -63,7 +63,7 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 			"show_hidden_sys_files":  cfg.Reva.MetadataStorage.EOS.ShowHiddenSysFiles,
 			"force_single_user_mode": cfg.Reva.MetadataStorage.EOS.ForceSingleUserMode,
 			"use_keytab":             cfg.Reva.MetadataStorage.EOS.UseKeytab,
-			"enable_home":            cfg.Reva.MetadataStorage.EOS.EnableHome,
+			"enable_home":            false,
 			"gatewaysvc":             cfg.Reva.MetadataStorage.EOS.GatewaySVC,
 		},
 		"local": map[string]interface{}{
@@ -81,7 +81,7 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 			"sharedirectory":  cfg.Reva.MetadataStorage.OwnCloud.ShareFolder,
 			"user_layout":     cfg.Reva.MetadataStorage.OwnCloud.UserLayout,
 			"redis":           cfg.Reva.MetadataStorage.OwnCloud.Redis,
-			"enable_home":     cfg.Reva.MetadataStorage.OwnCloud.EnableHome,
+			"enable_home":     false,
 			"scan":            cfg.Reva.MetadataStorage.OwnCloud.Scan,
 			"userprovidersvc": cfg.Reva.Users.Endpoint,
 		},
@@ -90,7 +90,7 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 			"upload_info_dir": cfg.Reva.MetadataStorage.OwnCloudSQL.UploadInfoDir,
 			"sharedirectory":  cfg.Reva.MetadataStorage.OwnCloudSQL.ShareFolder,
 			"user_layout":     cfg.Reva.MetadataStorage.OwnCloudSQL.UserLayout,
-			"enable_home":     cfg.Reva.MetadataStorage.OwnCloudSQL.EnableHome,
+			"enable_home":     false,
 			"dbusername":      cfg.Reva.MetadataStorage.OwnCloudSQL.DBUsername,
 			"dbpassword":      cfg.Reva.MetadataStorage.OwnCloudSQL.DBPassword,
 			"dbhost":          cfg.Reva.MetadataStorage.OwnCloudSQL.DBHost,
@@ -100,7 +100,7 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 		},
 		"ocis": map[string]interface{}{
 			"root":                cfg.Reva.MetadataStorage.OCIS.Root,
-			"enable_home":         cfg.Reva.MetadataStorage.OCIS.EnableHome,
+			"enable_home":         false,
 			"user_layout":         cfg.Reva.MetadataStorage.OCIS.UserLayout,
 			"treetime_accounting": true,
 			"treesize_accounting": true,
@@ -116,7 +116,7 @@ func MetadataDrivers(cfg *config.Config) map[string]interface{} {
 		},
 		"s3ng": map[string]interface{}{
 			"root":          cfg.Reva.MetadataStorage.S3NG.Root,
-			"enable_home":   cfg.Reva.MetadataStorage.S3NG.EnableHome,
+			"enable_home":   false,
 			"user_layout":   cfg.Reva.MetadataStorage.S3NG.UserLayout,
 			"s3.region":     cfg.Reva.MetadataStorage.S3NG.Region,
 			"s3.access_key": cfg.Reva.MetadataStorage.S3NG.AccessKey,
diff --git a/storage/pkg/command/storagemetadata.go b/storage/pkg/command/storagemetadata.go
index 2154fd7dfd2..66b51988566 100644
--- a/storage/pkg/command/storagemetadata.go
+++ b/storage/pkg/command/storagemetadata.go
@@ -48,15 +48,6 @@ func StorageMetadata(cfg *config.Config) *cli.Command {
 			defer cancel()
 
 			pidFile := path.Join(os.TempDir(), "revad-"+c.Command.Name+"-"+uuid.Must(uuid.NewV4()).String()+".pid")
-
-			// Disable home because the metadata is stored independently
-			// of the user. This also means that a valid-token without any user-id
-			// is allowed to write to the metadata-storage.
-			cfg.Reva.MetadataStorage.EOS.EnableHome = false
-			cfg.Reva.MetadataStorage.Local.EnableHome = false
-			cfg.Reva.MetadataStorage.OwnCloud.EnableHome = false
-			cfg.Reva.MetadataStorage.S3.EnableHome = false
-
 			rcfg := storageMetadataFromStruct(c, cfg)
 
 			gr.Add(func() error {