@@ -1769,6 +1769,10 @@ void Database::FinalizeStatements() {
   statements_.clear();
 }
 
+void Database::TrackStatement(Statement* statement) {
+  statements_.insert(statement);
+}
+
 void Database::UntrackStatement(Statement* statement) {
   statements_.erase(statement);
 }
@@ -2182,7 +2186,6 @@ void Database::Prepare(const FunctionCallbackInfo<Value>& args) {
   if (!stmt) {
     return;
   }
-  db->statements_.insert(stmt.get());
 
   if (return_arrays.has_value()) {
     stmt->return_arrays_ = return_arrays.value();
@@ -3491,6 +3494,7 @@ Statement::Statement(Environment* env,
                      BaseObjectPtr<Database> db,
                      StatementPtr stmt)
     : BaseObject(env, object), db_(std::move(db)), statement_(std::move(stmt)) {
+  db_->TrackStatement(this);
   MakeWeak();
   use_big_ints_ = db_->use_big_ints();
   return_arrays_ = db_->return_arrays();
@@ -4660,7 +4664,6 @@ BaseObjectPtr<Statement> SQLTagStore::PrepareStatement(
       return BaseObjectPtr<Statement>();
     }
 
-    session->database_->statements_.insert(stmt_obj.get());
     session->sql_tags_.Put(sql, stmt_obj);
     stmt = stmt_obj;
   }
 
@@ -262,6 +262,7 @@ class Database : public BaseObject {
   void RemoveBackup(BackupJob* backup);
   void AddBackup(BackupJob* backup);
   void FinalizeBackups();
+  void TrackStatement(Statement* statement);
   void UntrackStatement(Statement* statement);
   bool IsOpen();
   // SQL functions are one of several paths by which SQLite can invoke JS.
Original file line number	Diff line number	Diff line change
`@@ -1769,6 +1769,10 @@ void Database::FinalizeStatements() {`
`1769`	`1769`	`statements_.clear();`
`1770`	`1770`	`}`
`1771`	`1771`
	`1772`	`+void Database::TrackStatement(Statement* statement) {`
	`1773`	`+ statements_.insert(statement);`
	`1774`	`+}`
	`1775`	`+`
`1772`	`1776`	`void Database::UntrackStatement(Statement* statement) {`
`1773`	`1777`	`statements_.erase(statement);`
`1774`	`1778`	`}`
`@@ -2182,7 +2186,6 @@ void Database::Prepare(const FunctionCallbackInfo<Value>& args) {`
`2182`	`2186`	`if (!stmt) {`
`2183`	`2187`	`return;`
`2184`	`2188`	`}`
`2185`		`- db->statements_.insert(stmt.get());`
`2186`	`2189`
`2187`	`2190`	`if (return_arrays.has_value()) {`
`2188`	`2191`	`stmt->return_arrays_ = return_arrays.value();`
`@@ -3491,6 +3494,7 @@ Statement::Statement(Environment* env,`
`3491`	`3494`	`BaseObjectPtr<Database> db,`
`3492`	`3495`	`StatementPtr stmt)`
`3493`	`3496`	`: BaseObject(env, object), db_(std::move(db)), statement_(std::move(stmt)) {`
	`3497`	`+ db_->TrackStatement(this);`
`3494`	`3498`	`MakeWeak();`
`3495`	`3499`	`use_big_ints_ = db_->use_big_ints();`
`3496`	`3500`	`return_arrays_ = db_->return_arrays();`
`@@ -4660,7 +4664,6 @@ BaseObjectPtr<Statement> SQLTagStore::PrepareStatement(`
`4660`	`4664`	`return BaseObjectPtr<Statement>();`
`4661`	`4665`	`}`
`4662`	`4666`
`4663`		`- session->database_->statements_.insert(stmt_obj.get());`
`4664`	`4667`	`session->sql_tags_.Put(sql, stmt_obj);`
`4665`	`4668`	`stmt = stmt_obj;`
`4666`	`4669`	`}`