diff --git a/model/license.go b/model/license.go
index ad1911a6aa..1b324ad660 100644
--- a/model/license.go
+++ b/model/license.go
@@ -236,7 +236,7 @@ func (f *Features) SetDefaults() {
 	}
 
 	if f.SharedChannels == nil {
-		f.SharedChannels = NewBool(false)
+		f.SharedChannels = NewBool(*f.FutureFeatures)
 	}
 
 	if f.RemoteClusterService == nil {
diff --git a/model/license_test.go b/model/license_test.go
index 175948c1d2..c85b500e58 100644
--- a/model/license_test.go
+++ b/model/license_test.go
@@ -33,8 +33,8 @@ func TestLicenseFeaturesToMap(t *testing.T) {
 	CheckTrue(t, m["custom_permissions_schemes"].(bool))
 	CheckTrue(t, m["id_loaded"].(bool))
 	CheckTrue(t, m["future"].(bool))
-	CheckFalse(t, m["shared_channels"].(bool))
-	CheckFalse(t, m["remote_cluster_service"].(bool))
+	CheckTrue(t, m["shared_channels"].(bool))
+	CheckTrue(t, m["remote_cluster_service"].(bool))
 }
 
 func TestLicenseFeaturesSetDefaults(t *testing.T) {
@@ -59,8 +59,8 @@ func TestLicenseFeaturesSetDefaults(t *testing.T) {
 	CheckTrue(t, *f.CustomPermissionsSchemes)
 	CheckTrue(t, *f.GuestAccountsPermissions)
 	CheckTrue(t, *f.IDLoadedPushNotifications)
-	CheckFalse(t, *f.SharedChannels)
-	CheckFalse(t, *f.RemoteClusterService)
+	CheckTrue(t, *f.SharedChannels)
+	CheckTrue(t, *f.RemoteClusterService)
 	CheckTrue(t, *f.FutureFeatures)
 
 	f = Features{}