diff --git a/model/config.go b/model/config.go
index 40e3c2db84..43b8fe65cc 100644
--- a/model/config.go
+++ b/model/config.go
@@ -2110,6 +2110,10 @@ func (s *PluginSettings) SetDefaults() {
 	if s.PluginStates == nil {
 		s.PluginStates = make(map[string]*PluginState)
 	}
+
+	if s.PluginStates["com.mattermost.nps"] == nil {
+		s.PluginStates["com.mattermost.nps"] = &PluginState{Enable: true}
+	}
 }
 
 type GlobalRelayMessageExportSettings struct {
diff --git a/model/config_test.go b/model/config_test.go
index 6ed646c585..187edf3d31 100644
--- a/model/config_test.go
+++ b/model/config_test.go
@@ -127,6 +127,21 @@ func TestConfigDefaultServiceSettingsExperimentalGroupUnreadChannels(t *testing.
 	}
 }
 
+func TestConfigDefaultNPSPluginState(t *testing.T) {
+	c1 := Config{}
+	c1.SetDefaults()
+
+	if c1.PluginSettings.PluginStates["com.mattermost.nps"].Enable != true {
+		t.Fatal("PluginSettings.PluginStates[\"com.mattermost.nps\"].Enable should default to true")
+	}
+
+	c1.PluginSettings.PluginStates["com.mattermost.nps"].Enable = false
+	c1.SetDefaults()
+	if c1.PluginSettings.PluginStates["com.mattermost.nps"].Enable != false {
+		t.Fatal("PluginSettings.PluginStates[\"com.mattermost.nps\"].Enable should remain false")
+	}
+}
+
 func TestTeamSettingsIsValidSiteNameEmpty(t *testing.T) {
 	c1 := Config{}
 	c1.SetDefaults()