diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index b98d7e0d8..d9521d999 100644
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -76,7 +76,8 @@ def _is_valid_section(section_name):
     """
     return (
         section_name.startswith("storageserver.plugins.") or
-        section_name.startswith("storageclient.plugins.")
+        section_name.startswith("storageclient.plugins.") or
+        section_name in ("grid_managers", "grid_manager_certificates")
     )
 
 
@@ -93,8 +94,6 @@ _client_config = configutil.ValidConfiguration(
             "shares.total",
             "storage.plugins",
         ),
-        "grid_managers": None,  # means "any options valid"
-        "grid_manager_certificates": None,
         "storage": (
             "debug_discard",
             "enabled",
diff --git a/src/allmydata/util/configutil.py b/src/allmydata/util/configutil.py
index 9e18e3716..a82cb04a4 100644
--- a/src/allmydata/util/configutil.py
+++ b/src/allmydata/util/configutil.py
@@ -170,11 +170,8 @@ class ValidConfiguration(object):
         :return: True if the given section name, item_name pair is valid, False
             otherwise.
         """
-        valid_items = self._static_valid_sections.get(section_name, ())
-        if valid_items is None:
-            return True
         return (
-            item_name in valid_items or
+            item_name in self._static_valid_sections.get(section_name, ()) or
             self._is_valid_item(section_name, item_name)
         )