diff --git a/superset/migrations/versions/b8d3a24d9131_new_dataset_models.py b/superset/migrations/versions/b8d3a24d9131_new_dataset_models.py
index e6d4537272..1e139dd6a3 100644
--- a/superset/migrations/versions/b8d3a24d9131_new_dataset_models.py
+++ b/superset/migrations/versions/b8d3a24d9131_new_dataset_models.py
@@ -321,8 +321,10 @@ def after_insert(target: SqlaTable) -> None:  # pylint: disable=too-many-locals
     # table names
     database = (
         target.database
-        or session.query(Database).filter_by(id=target.database_id).one()
+        or session.query(Database).filter_by(id=target.database_id).first()
     )
+    if not database:
+        return
     engine = database.get_sqla_engine(schema=target.schema)
     conditional_quote = engine.dialect.identifier_preparer.quote