diff --git a/superset/config.py b/superset/config.py
index a44a67168..8a85d14cd 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -285,6 +285,7 @@ DEFAULT_FEATURE_FLAGS = {
     "REDUCE_DASHBOARD_BOOTSTRAP_PAYLOAD": False,
     "SHARE_QUERIES_VIA_KV_STORE": False,
     "TAGGING_SYSTEM": False,
+    "SQLLAB_BACKEND_PERSISTENCE": False,
 }
 
 # This is merely a default.
diff --git a/superset/views/core.py b/superset/views/core.py
index 469000923..ff6dcbfbb 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -2704,7 +2704,7 @@ class Superset(BaseSupersetView):
             .filter_by(user_id=user_id)
             .all()
         )
-        tab_state_ids = [tab_state[0] for tab_state in tabs_state]
+        tab_state_ids = [str(tab_state[0]) for tab_state in tabs_state]
         # return first active tab, or fallback to another one if no tab is active
         active_tab = (
             db.session.query(TabState)
@@ -2728,7 +2728,7 @@ class Superset(BaseSupersetView):
             user_queries = (
                 db.session.query(Query)
                 .filter_by(user_id=user_id)
-                .filter(Query.sql_editor_id.cast(Integer).in_(tab_state_ids))
+                .filter(Query.sql_editor_id.in_(tab_state_ids))
                 .all()
             )
             queries = {