diff --git a/src/EFCore.Relational/Query/Internal/GroupBySingleQueryingEnumerable.cs b/src/EFCore.Relational/Query/Internal/GroupBySingleQueryingEnumerable.cs
index af0eb423bff..24f47e554a4 100644
--- a/src/EFCore.Relational/Query/Internal/GroupBySingleQueryingEnumerable.cs
+++ b/src/EFCore.Relational/Query/Internal/GroupBySingleQueryingEnumerable.cs
@@ -145,7 +145,7 @@ public virtual DbCommand CreateDbCommand()
                     _relationalQueryContext.Connection,
                     _relationalQueryContext.Parameters,
                     null,
-                    null,
+                    _relationalQueryContext.Context,
                     null, CommandSource.LinqQuery),
                 Guid.Empty,
                 (DbCommandMethod)(-1));
diff --git a/src/EFCore.Relational/Query/Internal/GroupBySplitQueryingEnumerable.cs b/src/EFCore.Relational/Query/Internal/GroupBySplitQueryingEnumerable.cs
index e8b67872908..1696922220b 100644
--- a/src/EFCore.Relational/Query/Internal/GroupBySplitQueryingEnumerable.cs
+++ b/src/EFCore.Relational/Query/Internal/GroupBySplitQueryingEnumerable.cs
@@ -155,7 +155,7 @@ public virtual DbCommand CreateDbCommand()
                     _relationalQueryContext.Connection,
                     _relationalQueryContext.Parameters,
                     null,
-                    null,
+                    _relationalQueryContext.Context,
                     null, CommandSource.LinqQuery),
                 Guid.Empty,
                 (DbCommandMethod)(-1));
diff --git a/src/EFCore.Relational/Query/Internal/SingleQueryingEnumerable.cs b/src/EFCore.Relational/Query/Internal/SingleQueryingEnumerable.cs
index 5a79eb34b9e..85b999e82a0 100644
--- a/src/EFCore.Relational/Query/Internal/SingleQueryingEnumerable.cs
+++ b/src/EFCore.Relational/Query/Internal/SingleQueryingEnumerable.cs
@@ -129,7 +129,7 @@ public virtual DbCommand CreateDbCommand()
                     _relationalQueryContext.Connection,
                     _relationalQueryContext.Parameters,
                     null,
-                    null,
+                    _relationalQueryContext.Context,
                     null, CommandSource.LinqQuery),
                 Guid.Empty,
                 (DbCommandMethod)(-1));
diff --git a/src/EFCore.Sqlite.Core/Storage/Internal/SqliteDatabaseCreator.cs b/src/EFCore.Sqlite.Core/Storage/Internal/SqliteDatabaseCreator.cs
index 681a08b37b7..311abf79b3d 100644
--- a/src/EFCore.Sqlite.Core/Storage/Internal/SqliteDatabaseCreator.cs
+++ b/src/EFCore.Sqlite.Core/Storage/Internal/SqliteDatabaseCreator.cs
@@ -52,7 +52,7 @@ public override void Create()
                     Dependencies.Connection,
                     null,
                     null,
-                    null,
+                    Dependencies.CurrentContext.Context,
                     Dependencies.CommandLogger, CommandSource.Migrations));
 
         Dependencies.Connection.Close();
@@ -101,7 +101,7 @@ public override bool HasTables()
                     Dependencies.Connection,
                     null,
                     null,
-                    null,
+                    Dependencies.CurrentContext.Context,
                     Dependencies.CommandLogger, CommandSource.Migrations))!;
 
         return count != 0;