diff --git a/config/config.json b/config/config.json
index b14175372f..88da332153 100644
--- a/config/config.json
+++ b/config/config.json
@@ -89,4 +89,4 @@
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
     }
-}
+}
\ No newline at end of file
diff --git a/utils/config.go b/utils/config.go
index 44c4c43aff..90e44259af 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -179,6 +179,8 @@ func getClientProperties(c *model.Config) map[string]string {
 	props["BuildHash"] = model.BuildHash
 
 	props["SiteName"] = c.TeamSettings.SiteName
+	props["EnableTeamCreation"] = strconv.FormatBool(c.TeamSettings.EnableTeamCreation)
+
 	props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider)
 
 	props["SegmentDeveloperKey"] = c.ServiceSettings.SegmentDeveloperKey
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index 78057d10bc..30c4e94ae6 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -135,30 +135,35 @@ export default class NavbarDropdown extends React.Component {
 
         var teams = [];
 
-        teams.push(
-            <li
-                className='divider'
-                key='div'
-            >
-            </li>
-        );
-
         if (this.state.teams.length > 1) {
+            teams.push(
+                <li
+                    className='divider'
+                    key='div'
+                >
+                </li>
+            );
+
             this.state.teams.forEach((teamName) => {
                 if (teamName !== this.props.teamName) {
                     teams.push(<li key={teamName}><a href={Utils.getWindowLocationOrigin() + '/' + teamName}>{'Switch to ' + teamName}</a></li>);
                 }
             });
         }
-        teams.push(<li key='newTeam_li'>
-                        <a
-                            key='newTeam_a'
-                            target='_blank'
-                            href={Utils.getWindowLocationOrigin() + '/signup_team'}
-                        >
-                            {'Create a New Team'}
-                        </a>
-                    </li>);
+
+        if (global.window.config.EnableTeamCreation === 'true') {
+            teams.push(
+                <li key='newTeam_li'>
+                    <a
+                        key='newTeam_a'
+                        target='_blank'
+                        href={Utils.getWindowLocationOrigin() + '/signup_team'}
+                    >
+                        {'Create a New Team'}
+                    </a>
+                </li>
+            );
+        }
 
         return (
             <ul className='nav navbar-nav navbar-right'>