diff --git a/superset/config.py b/superset/config.py
index b8f810159a864..8ea153aa1a32e 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -1078,6 +1078,11 @@ class CeleryConfig:  # pylint: disable=too-few-public-methods
 # It will get executed each time when user open a chart's explore view.
 DATASET_HEALTH_CHECK = None
 
+# -------------------------------------------------------------------
+# *                WARNING:  STOP EDITING  HERE                    *
+# -------------------------------------------------------------------
+# Don't add config values below this line since local configs won't be
+# able to override them.
 if CONFIG_PATH_ENV_VAR in os.environ:
     # Explicitly import config module that is not necessarily in pythonpath; useful
     # for case where app is being executed via pex.
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 13599a26b7c20..833f3fc8267f5 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -704,6 +704,8 @@ def data(self) -> Dict[str, Any]:
             data_["fetch_values_predicate"] = self.fetch_values_predicate
             data_["template_params"] = self.template_params
             data_["is_sqllab_view"] = self.is_sqllab_view
+            # Don't return previously populated health check message in case
+            # the health check feature is turned off
             data_["health_check_message"] = (
                 self.health_check_message
                 if config.get("DATASET_HEALTH_CHECK")