diff --git a/src/sdk/PnP.Core/Model/Base/DataModelExtensions.cs b/src/sdk/PnP.Core/Model/Base/DataModelExtensions.cs
index 6aa731284f..af4b510062 100644
--- a/src/sdk/PnP.Core/Model/Base/DataModelExtensions.cs
+++ b/src/sdk/PnP.Core/Model/Base/DataModelExtensions.cs
@@ -60,7 +60,7 @@ internal static async Task EnsureParentObjectAsync(this IDataModelParent model)
                         await gettableParent.LoadBatchAsync(ensureParentBatch, expressions).ConfigureAwait(false);
 
                         // Make the actual request
-                        await contextAwareParent.PnPContext.BatchClient.ExecuteBatch(ensureParentBatch).ConfigureAwait(true);
+                        await contextAwareParent.PnPContext.BatchClient.ExecuteBatch(ensureParentBatch).ConfigureAwait(false);
                     }
                 }
             }
diff --git a/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/Page.cs b/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/Page.cs
index 3d57811e0e..1da215e8da 100644
--- a/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/Page.cs
+++ b/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/Page.cs
@@ -1942,7 +1942,7 @@ private async Task ValidateOneColumnFullWidthSectionUsageAsync()
             }
             if (hasOneColumnFullWidthSection)
             {
-                await PnPContext.Web.EnsurePropertiesAsync(p => p.WebTemplate).ConfigureAwait(true);
+                await PnPContext.Web.EnsurePropertiesAsync(p => p.WebTemplate).ConfigureAwait(false);
                 if (!PnPContext.Web.WebTemplate.Equals("SITEPAGEPUBLISHING", StringComparison.InvariantCultureIgnoreCase) &&
                     // we allow enabling communication site features on STS and EHS sites, so don't block adding full width sections on those sites
                     !PnPContext.Web.WebTemplate.Equals("STS", StringComparison.InvariantCultureIgnoreCase) &&
diff --git a/src/sdk/PnP.Core/Services/Core/Query/TokenHandler.cs b/src/sdk/PnP.Core/Services/Core/Query/TokenHandler.cs
index bbdc6effc0..3b9f7395b2 100644
--- a/src/sdk/PnP.Core/Services/Core/Query/TokenHandler.cs
+++ b/src/sdk/PnP.Core/Services/Core/Query/TokenHandler.cs
@@ -62,7 +62,7 @@ public static async Task<string> ResolveTokensAsync(IMetadataExtensible pnpObjec
                     // Ensure the parent object
                     if (parent != null)
                     {
-                        await ((IDataModelParent)pnpObject).EnsureParentObjectAsync().ConfigureAwait(true);
+                        await ((IDataModelParent)pnpObject).EnsureParentObjectAsync().ConfigureAwait(false);
                     }
 
                     if (parent is IMetadataExtensible p)
@@ -94,7 +94,7 @@ public static async Task<string> ResolveTokensAsync(IMetadataExtensible pnpObjec
                     // Ensure the parent object
                     if (parent != null)
                     {
-                        await ((IDataModelParent)pnpObject).EnsureParentObjectAsync().ConfigureAwait(true);
+                        await ((IDataModelParent)pnpObject).EnsureParentObjectAsync().ConfigureAwait(false);
                     }
 
                     if (parent is IMetadataExtensible p)