diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 2da60682ec..46325d8521 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -305,9 +305,6 @@ class SynapseHomeServer(HomeServer):
 # Gauges to expose monthly active user control metrics
 current_mau_gauge = Gauge("synapse_admin_current_mau", "Current MAU")
 max_mau_value_gauge = Gauge("synapse_admin_max_mau_value", "MAU Limit")
-limit_usage_by_mau_gauge = Gauge(
-    "synapse_admin_limit_usage_by_mau", "MAU Limiting enabled"
-)
 
 
 def setup(config_options):
@@ -528,7 +525,6 @@ def run(hs):
             count = hs.get_datastore().count_monthly_users()
         current_mau_gauge.set(float(count))
         max_mau_value_gauge.set(float(hs.config.max_mau_value))
-        limit_usage_by_mau_gauge.set(float(hs.config.limit_usage_by_mau))
 
     generate_monthly_active_users()
     if hs.config.limit_usage_by_mau:
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 9af42a93ad..a8014e9c50 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -69,9 +69,12 @@ class ServerConfig(Config):
 
         # Options to control access by tracking MAU
         self.limit_usage_by_mau = config.get("limit_usage_by_mau", False)
-        self.max_mau_value = config.get(
-            "max_mau_value", 0,
-        )
+        if self.limit_usage_by_mau:
+            self.max_mau_value = config.get(
+                "max_mau_value", 0,
+            )
+        else:
+            self.max_mau_value = 0
         # FIXME: federation_domain_whitelist needs sytests
         self.federation_domain_whitelist = None
         federation_domain_whitelist = config.get(