diff --git a/model/config.go b/model/config.go
index 71b76096fa..a8e0b0b072 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1021,6 +1021,10 @@ func (s *TeamSettings) SetDefaults() {
 	if s.ExperimentalTownSquareIsReadOnly == nil {
 		s.ExperimentalTownSquareIsReadOnly = NewBool(false)
 	}
+
+	if s.DefaultTeamName == nil {
+		s.DefaultTeamName = NewString("")
+	}
 }
 
 type ClientRequirements struct {