diff --git a/changelog/unreleased/fix-remove-unused-config-options.md b/changelog/unreleased/fix-remove-unused-config-options.md
index 722b47aee0..f24eec9f34 100644
--- a/changelog/unreleased/fix-remove-unused-config-options.md
+++ b/changelog/unreleased/fix-remove-unused-config-options.md
@@ -4,9 +4,9 @@ We've removed multiple unused configuration options:
 
 - `STORAGE_SYSTEM_DATAPROVIDER_INSECURE`, see also cs3org/reva#2993
 - `STORAGE_USERS_DATAPROVIDER_INSECURE`, see also cs3org/reva#2993
-- `STORAGE_SYSTEM_TEMP_FOLDER`, see also cs3org/reva#2993 
+- `STORAGE_SYSTEM_TEMP_FOLDER`, see also cs3org/reva#2993
 - `STORAGE_USERS_TEMP_FOLDER`, see also cs3org/reva#2993
 - `WEB_UI_CONFIG_VERSION`, see also owncloud/web#7130
+- `GATEWAY_COMMIT_SHARE_TO_STORAGE_REF`, see also cs3org/reva#3017
 
 https://github.com/owncloud/ocis/pull/3973
-
diff --git a/services/gateway/pkg/config/config.go b/services/gateway/pkg/config/config.go
index 4cd0a9a508..bb2c023ca9 100644
--- a/services/gateway/pkg/config/config.go
+++ b/services/gateway/pkg/config/config.go
@@ -21,8 +21,7 @@ type Config struct {
 
 	SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"GATEWAY_SKIP_USER_GROUPS_IN_TOKEN" desc:"Disables the loading of user's group memberships from the reva access token."`
 
-	CommitShareToStorageGrant  bool   `yaml:"commit_share_to_storage_grant" env:"GATEWAY_COMMIT_SHARE_TO_STORAGE_GRANT" desc:"Commit shares to storage grants."`
-	CommitShareToStorageRef    bool   `yaml:"commit_share_to_storage_ref" env:"GATEWAY_COMMIT_SHARE_TO_STORAGE_REF" desc:"Commit shares to storage."`
+	CommitShareToStorageGrant  bool   `yaml:"commit_share_to_storage_grant" env:"GATEWAY_COMMIT_SHARE_TO_STORAGE_GRANT" desc:"Commit shares to storage grants. This grants access to shared resources for the share receiver directly on the storage."`
 	ShareFolder                string `yaml:"share_folder_name" env:"GATEWAY_SHARE_FOLDER_NAME" desc:"Name of the share folder in users' home space."`
 	DisableHomeCreationOnLogin bool   `yaml:"disable_home_creation_on_login" env:"GATEWAY_DISABLE_HOME_CREATION_ON_LOGIN" desc:"Disable creation of the home space on login."`
 	TransferSecret             string `yaml:"transfer_secret" env:"STORAGE_TRANSFER_SECRET" desc:"The storage transfer secret"` // TODO: how to name the env
diff --git a/services/gateway/pkg/config/defaults/defaultconfig.go b/services/gateway/pkg/config/defaults/defaultconfig.go
index 34d36e16ed..cd2d2bacad 100644
--- a/services/gateway/pkg/config/defaults/defaultconfig.go
+++ b/services/gateway/pkg/config/defaults/defaultconfig.go
@@ -32,7 +32,6 @@ func DefaultConfig() *config.Config {
 		},
 
 		CommitShareToStorageGrant:  true,
-		CommitShareToStorageRef:    true,
 		ShareFolder:                "Shares",
 		DisableHomeCreationOnLogin: true,
 		TransferExpires:            24 * 60 * 60,
diff --git a/services/gateway/pkg/revaconfig/config.go b/services/gateway/pkg/revaconfig/config.go
index 3d9850a9c0..3d6fa39b3c 100644
--- a/services/gateway/pkg/revaconfig/config.go
+++ b/services/gateway/pkg/revaconfig/config.go
@@ -45,7 +45,6 @@ func GatewayConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]i
 					"publicshareprovidersvc":        cfg.SharingEndpoint,
 					"ocmshareprovidersvc":           cfg.SharingEndpoint,
 					"commit_share_to_storage_grant": cfg.CommitShareToStorageGrant,
-					"commit_share_to_storage_ref":   cfg.CommitShareToStorageRef,
 					"share_folder":                  cfg.ShareFolder, // ShareFolder is the location where to create shares in the recipient's storage provider.
 					// other
 					"disable_home_creation_on_login": cfg.DisableHomeCreationOnLogin,