1 files changed, 8 insertions, 6 deletions
diff --git a/webapp/components/admin_console/custom_brand_settings.jsx b/webapp/components/admin_console/custom_brand_settings.jsx
index c6fe1cfae..193889ea9 100644
--- a/webapp/components/admin_console/custom_brand_settings.jsx
+++ b/webapp/components/admin_console/custom_brand_settings.jsx
@@ -19,12 +19,6 @@ export default class CustomBrandSettings extends AdminSettings {
         this.getConfigFromState = this.getConfigFromState.bind(this);
 
         this.renderSettings = this.renderSettings.bind(this);
-
-        this.state = Object.assign(this.state, {
-            siteName: props.config.TeamSettings.SiteName,
-            enableCustomBrand: props.config.TeamSettings.EnableCustomBrand,
-            customBrandText: props.config.TeamSettings.CustomBrandText
-        });
     }
 
     getConfigFromState(config) {
@@ -37,6 +31,14 @@ export default class CustomBrandSettings extends AdminSettings {
         return config;
     }
 
+    getStateFromConfig(config) {
+        return {
+            siteName: config.TeamSettings.SiteName,
+            enableCustomBrand: config.TeamSettings.EnableCustomBrand,
+            customBrandText: config.TeamSettings.CustomBrandText
+        };
+    }
+
     renderTitle() {
         return (
             <h3>