diff --git a/setup.cfg b/setup.cfg
index e2d415b1a0..db9bbc9ebd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,7 +45,7 @@ combine_as_imports = true
 include_trailing_comma = true
 line_length = 88
 known_first_party = superset
-known_third_party =alembic,backoff,bleach,celery,click,colorama,contextlib2,croniter,dateutil,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_wtf,geohash,geopy,humanize,isodate,jinja2,markdown,marshmallow,msgpack,numpy,pandas,parsedatetime,pathlib2,polyline,prison,psycopg2,pyarrow,pyhive,pytz,retry,selenium,setuptools,simplejson,sphinx_rtd_theme,sqlalchemy,sqlalchemy_utils,sqlparse,werkzeug,wtforms,wtforms_json,yaml
+known_third_party =alembic,backoff,bleach,celery,click,colorama,contextlib2,croniter,dateutil,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,geohash,geopy,humanize,isodate,jinja2,markdown,marshmallow,msgpack,numpy,pandas,parsedatetime,pathlib2,polyline,prison,psycopg2,pyarrow,pyhive,pytz,retry,selenium,setuptools,simplejson,sphinx_rtd_theme,sqlalchemy,sqlalchemy_utils,sqlparse,werkzeug,wtforms,wtforms_json,yaml
 multi_line_output = 3
 order_by_type = false
 
diff --git a/superset/views/core.py b/superset/views/core.py
index 5d1c861674..a2edba6791 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -3064,17 +3064,26 @@ class Superset(BaseSupersetView):
             .order_by(TabState.active.desc())
             .first()
         )
-        databases = {
-            database.id: {
-                k: v for k, v in database.to_json().items() if k in DATABASE_KEYS
+
+        databases = {}
+        queries = {}
+
+        # These are unnecessary if sqllab backend persistence is disabled
+        if is_feature_enabled("SQLLAB_BACKEND_PERSISTENCE"):
+            databases = {
+                database.id: {
+                    k: v for k, v in database.to_json().items() if k in DATABASE_KEYS
+                }
+                for database in db.session.query(models.Database).all()
             }
-            for database in db.session.query(models.Database).all()
-        }
-        user_queries = db.session.query(Query).filter_by(user_id=g.user.get_id()).all()
-        queries = {
-            query.client_id: {k: v for k, v in query.to_dict().items()}
-            for query in user_queries
-        }
+            user_queries = (
+                db.session.query(Query).filter_by(user_id=g.user.get_id()).all()
+            )
+            queries = {
+                query.client_id: {k: v for k, v in query.to_dict().items()}
+                for query in user_queries
+            }
+
         d = {
             "defaultDbId": config["SQLLAB_DEFAULT_DBID"],
             "common": self.common_bootstrap_payload(),