diff --git a/superset/assets/javascripts/SqlLab/actions.js b/superset/assets/javascripts/SqlLab/actions.js
index 721de87923c..c2612b419ce 100644
--- a/superset/assets/javascripts/SqlLab/actions.js
+++ b/superset/assets/javascripts/SqlLab/actions.js
@@ -356,7 +356,7 @@ export function popSavedQuery(saveQueryId) {
         const sq = data.result;
         const queryEditorProps = {
           title: sq.label,
-          dbId: sq.db_id,
+          dbId: sq.db_id ? parseInt(sq.db_id, 10) : null,
           schema: sq.schema,
           autorun: false,
           sql: sq.sql,