diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py
index 7b495f1d..328956f4 100644
--- a/confluent_server/confluent/config/configmanager.py
+++ b/confluent_server/confluent/config/configmanager.py
@@ -1414,7 +1414,7 @@ class ConfigManager(object):
             elif 'tenant' not in _cfgstore and create_tenant:
                 _cfgstore['tenant'] = {tenant: {}}
                 self._bg_sync_to_file()
-            elif tenant not in _cfgstore['tenant'] and create_tenant:
+            elif tenant not in _cfgstore.get('tenant', {}) and create_tenant:
                 _cfgstore['tenant'][tenant] = {}
                 self._bg_sync_to_file()
             elif tenant and tenant not in _cfgstore.get('tenant', {}):