diff --git a/config/diff_test.go b/config/diff_test.go
index 15ec6f41f7..427045dae7 100644
--- a/config/diff_test.go
+++ b/config/diff_test.go
@@ -808,7 +808,7 @@ func TestDiff(t *testing.T) {
 							Enable: !defaultConfigGen().PluginSettings.PluginStates["com.mattermost.nps"].Enable,
 						},
 						"focalboard": {
-							Enable: true,
+							Enable: false,
 						},
 						"playbooks": {
 							Enable: true,
@@ -846,7 +846,7 @@ func TestDiff(t *testing.T) {
 							Enable: true,
 						},
 						"focalboard": {
-							Enable: true,
+							Enable: false,
 						},
 						"playbooks": {
 							Enable: true,
@@ -876,7 +876,7 @@ func TestDiff(t *testing.T) {
 					BaseVal: defaultConfigGen().PluginSettings.PluginStates,
 					ActualVal: map[string]*model.PluginState{
 						"focalboard": {
-							Enable: true,
+							Enable: false,
 						},
 						"playbooks": {
 							Enable: true,
diff --git a/model/config.go b/model/config.go
index ad169fcbbf..ef948375cf 100644
--- a/model/config.go
+++ b/model/config.go
@@ -2867,8 +2867,8 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) {
 	}
 
 	if s.PluginStates[PluginIdFocalboard] == nil {
-		// Enable the focalboard plugin by default
-		s.PluginStates[PluginIdFocalboard] = &PluginState{Enable: true}
+		// Disable the focalboard plugin by default
+		s.PluginStates[PluginIdFocalboard] = &PluginState{Enable: false}
 	}
 
 	if s.PluginStates[PluginIdApps] == nil {
diff --git a/model/config_test.go b/model/config_test.go
index cedffbcb08..752ace1547 100644
--- a/model/config_test.go
+++ b/model/config_test.go
@@ -387,11 +387,11 @@ func TestConfigDefaultChannelExportPluginState(t *testing.T) {
 }
 
 func TestConfigDefaultFocalboardPluginState(t *testing.T) {
-	t.Run("should enable Focalboard plugin by default", func(t *testing.T) {
+	t.Run("should not enable Focalboard plugin by default", func(t *testing.T) {
 		c1 := Config{}
 		c1.SetDefaults()
 
-		assert.True(t, c1.PluginSettings.PluginStates["focalboard"].Enable)
+		assert.False(t, c1.PluginSettings.PluginStates["focalboard"].Enable)
 	})
 
 	t.Run("should not re-enable focalboard plugin after it has been disabled", func(t *testing.T) {
diff --git a/model/feature_flags.go b/model/feature_flags.go
index 4864a660c1..449a04b5bc 100644
--- a/model/feature_flags.go
+++ b/model/feature_flags.go
@@ -95,7 +95,7 @@ func (f *FeatureFlags) SetDefaults() {
 	f.InsightsEnabled = true
 	f.CommandPalette = false
 	f.CallsEnabled = true
-	f.BoardsProduct = false
+	f.BoardsProduct = true
 	f.SendWelcomePost = true
 	f.PostPriority = true
 	f.PeopleProduct = false
diff --git a/scripts/test.sh b/scripts/test.sh
index 63f89fc785..f13d9244c5 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -14,6 +14,7 @@ COVERMODE=$8
 
 PACKAGES_COMMA=$(echo $PACKAGES | tr ' ' ',')
 export MM_SERVER_PATH=$PWD
+export MM_FEATUREFLAGS_BoardsProduct=false
 
 echo "Packages to test: $PACKAGES"
 echo "GOFLAGS: $GOFLAGS"