diff --git a/reviewboard/features/checkers.py b/reviewboard/features/checkers.py
index 1ea33ad4409e9d08405e631024ef7294334f80c3..8e6228325804d8ac2e4fb82ae2dbed620b55f5e0 100644
--- a/reviewboard/features/checkers.py
+++ b/reviewboard/features/checkers.py
@@ -56,12 +56,11 @@ class RBFeatureChecker(SiteConfigFeatureChecker):
         if local_site is None and request is not None:
             local_site = request.local_site
 
-        if not (local_site and local_site.extra_data):
-            return super(RBFeatureChecker, self).is_feature_enabled(
-                feature_id, **kwargs)
-
-        try:
-            return local_site.extra_data[self.EXTRA_DATA_KEY][feature_id]
-        except KeyError:
-            return super(RBFeatureChecker, self).is_feature_enabled(
-                feature_id, **kwargs)
+        if local_site and local_site.extra_data:
+            try:
+                return local_site.extra_data[self.EXTRA_DATA_KEY][feature_id]
+            except KeyError:
+                pass
+
+        return super(RBFeatureChecker, self).is_feature_enabled(feature_id,
+                                                                **kwargs)