diff --git a/Octokit/Clients/Enterprise/EnterpriseProbe.cs b/Octokit/Clients/Enterprise/EnterpriseProbe.cs
index fa350c0b..3ea5bd48 100644
--- a/Octokit/Clients/Enterprise/EnterpriseProbe.cs
+++ b/Octokit/Clients/Enterprise/EnterpriseProbe.cs
@@ -77,7 +77,7 @@ namespace Octokit
             IResponse response;
             try
             {
-                response = await httpClient.Send(request);
+                response = await httpClient.Send(request).ConfigureAwait(false);
             }
             catch (ApiException ex)
             {
diff --git a/Octokit/Clients/MigrationsClient.cs b/Octokit/Clients/MigrationsClient.cs
index 18a8f4d2..532922f9 100644
--- a/Octokit/Clients/MigrationsClient.cs
+++ b/Octokit/Clients/MigrationsClient.cs
@@ -36,7 +36,7 @@ namespace Octokit
 
             var endpoint = ApiUrls.EnterpriseMigrations(org);
 
-            return await ApiConnection.Post<Migration>(endpoint, migration, AcceptHeaders.MigrationsApiPreview);
+            return await ApiConnection.Post<Migration>(endpoint, migration, AcceptHeaders.MigrationsApiPreview).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -53,7 +53,7 @@ namespace Octokit
 
             var endpoint = ApiUrls.EnterpriseMigrations(org);
 
-            return await ApiConnection.Get<List<Migration>>(endpoint, null, AcceptHeaders.MigrationsApiPreview);
+            return await ApiConnection.Get<List<Migration>>(endpoint, null, AcceptHeaders.MigrationsApiPreview).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -71,7 +71,7 @@ namespace Octokit
 
             var endpoint = ApiUrls.EnterpriseMigrationById(org, id);
 
-            return await ApiConnection.Get<Migration>(endpoint, null, AcceptHeaders.MigrationsApiPreview);
+            return await ApiConnection.Get<Migration>(endpoint, null, AcceptHeaders.MigrationsApiPreview).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -88,7 +88,7 @@ namespace Octokit
             Ensure.ArgumentNotNullOrEmptyString(org, "org");
 
             var endpoint = ApiUrls.EnterpriseMigrationArchive(org, id);
-            var response = await Connection.Get<byte[]>(endpoint, null, AcceptHeaders.MigrationsApiPreview);
+            var response = await Connection.Get<byte[]>(endpoint, null, AcceptHeaders.MigrationsApiPreview).ConfigureAwait(false);
 
             return response.Body;
         }
diff --git a/Octokit/Clients/PullRequestsClient.cs b/Octokit/Clients/PullRequestsClient.cs
index cbc52b65..dad64321 100644
--- a/Octokit/Clients/PullRequestsClient.cs
+++ b/Octokit/Clients/PullRequestsClient.cs
@@ -259,8 +259,7 @@ namespace Octokit
             try
             {
                 var endpoint = ApiUrls.MergePullRequest(owner, name, number);
-                return await ApiConnection.Put<PullRequestMerge>(endpoint, mergePullRequest, null,
-                    AcceptHeaders.SquashCommitPreview).ConfigureAwait(false);
+                return await ApiConnection.Put<PullRequestMerge>(endpoint, mergePullRequest, null, AcceptHeaders.SquashCommitPreview).ConfigureAwait(false);
             }
             catch (ApiException ex)
             {
@@ -292,8 +291,7 @@ namespace Octokit
             try
             {
                 var endpoint = ApiUrls.MergePullRequest(repositoryId, number);
-                return await ApiConnection.Put<PullRequestMerge>(endpoint, mergePullRequest, null,
-                    AcceptHeaders.SquashCommitPreview).ConfigureAwait(false);
+                return await ApiConnection.Put<PullRequestMerge>(endpoint, mergePullRequest, null, AcceptHeaders.SquashCommitPreview).ConfigureAwait(false);
             }
             catch (ApiException ex)
             {
diff --git a/Octokit/Clients/RepoCollaboratorsClient.cs b/Octokit/Clients/RepoCollaboratorsClient.cs
index 34a2dc30..4eda7655 100644
--- a/Octokit/Clients/RepoCollaboratorsClient.cs
+++ b/Octokit/Clients/RepoCollaboratorsClient.cs
@@ -176,7 +176,7 @@ namespace Octokit
 
             try
             {
-                var response = await Connection.Put<object>(ApiUrls.RepoCollaborator(owner, name, user), permission);
+                var response = await Connection.Put<object>(ApiUrls.RepoCollaborator(owner, name, user), permission).ConfigureAwait(false);
                 return response.HttpResponse.IsTrue();
             }
             catch
@@ -217,7 +217,7 @@ namespace Octokit
 
             try
             {
-                var response = await Connection.Put<object>(ApiUrls.RepoCollaborator(repositoryId, user), permission);
+                var response = await Connection.Put<object>(ApiUrls.RepoCollaborator(repositoryId, user), permission).ConfigureAwait(false);
                 return response.HttpResponse.IsTrue();
             }
             catch
diff --git a/Octokit/Clients/StatisticsClient.cs b/Octokit/Clients/StatisticsClient.cs
index d2733416..530ed029 100644
--- a/Octokit/Clients/StatisticsClient.cs
+++ b/Octokit/Clients/StatisticsClient.cs
@@ -100,8 +100,7 @@ namespace Octokit
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            var activity = await ApiConnection.GetQueuedOperation<WeeklyCommitActivity>(
-                ApiUrls.StatsCommitActivity(owner, name), cancellationToken).ConfigureAwait(false);
+            var activity = await ApiConnection.GetQueuedOperation<WeeklyCommitActivity>(ApiUrls.StatsCommitActivity(owner, name), cancellationToken).ConfigureAwait(false);
             return new CommitActivity(activity);
         }
 
@@ -112,8 +111,7 @@ namespace Octokit
         /// <param name="cancellationToken">A token used to cancel this potentially long running request</param>
         public async Task<CommitActivity> GetCommitActivity(long repositoryId, CancellationToken cancellationToken)
         {
-            var activity = await ApiConnection.GetQueuedOperation<WeeklyCommitActivity>(
-                ApiUrls.StatsCommitActivity(repositoryId), cancellationToken).ConfigureAwait(false);
+            var activity = await ApiConnection.GetQueuedOperation<WeeklyCommitActivity>(ApiUrls.StatsCommitActivity(repositoryId), cancellationToken).ConfigureAwait(false);
             return new CommitActivity(activity);
         }
 
@@ -150,8 +148,7 @@ namespace Octokit
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            var rawFrequencies = await ApiConnection.GetQueuedOperation<long[]>(
-                ApiUrls.StatsCodeFrequency(owner, name), cancellationToken).ConfigureAwait(false);
+            var rawFrequencies = await ApiConnection.GetQueuedOperation<long[]>(ApiUrls.StatsCodeFrequency(owner, name), cancellationToken).ConfigureAwait(false);
             return new CodeFrequency(rawFrequencies);
         }
 
@@ -162,8 +159,7 @@ namespace Octokit
         /// <param name="cancellationToken">A token used to cancel this potentially long running request</param>
         public async Task<CodeFrequency> GetCodeFrequency(long repositoryId, CancellationToken cancellationToken)
         {
-            var rawFrequencies = await ApiConnection.GetQueuedOperation<long[]>(
-                ApiUrls.StatsCodeFrequency(repositoryId), cancellationToken).ConfigureAwait(false);
+            var rawFrequencies = await ApiConnection.GetQueuedOperation<long[]>(ApiUrls.StatsCodeFrequency(repositoryId), cancellationToken).ConfigureAwait(false);
             return new CodeFrequency(rawFrequencies);
         }
 
@@ -200,8 +196,7 @@ namespace Octokit
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            var result = await ApiConnection.GetQueuedOperation<Participation>(
-                ApiUrls.StatsParticipation(owner, name), cancellationToken).ConfigureAwait(false);
+            var result = await ApiConnection.GetQueuedOperation<Participation>(ApiUrls.StatsParticipation(owner, name), cancellationToken).ConfigureAwait(false);
             return result.FirstOrDefault();
         }
 
@@ -212,8 +207,7 @@ namespace Octokit
         /// <param name="cancellationToken">A token used to cancel this potentially long running request</param>
         public async Task<Participation> GetParticipation(long repositoryId, CancellationToken cancellationToken)
         {
-            var result = await ApiConnection.GetQueuedOperation<Participation>(
-                ApiUrls.StatsParticipation(repositoryId), cancellationToken).ConfigureAwait(false);
+            var result = await ApiConnection.GetQueuedOperation<Participation>(ApiUrls.StatsParticipation(repositoryId), cancellationToken).ConfigureAwait(false);
             return result.FirstOrDefault();
         }
 
@@ -250,8 +244,7 @@ namespace Octokit
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            var punchCardData = await ApiConnection.GetQueuedOperation<int[]>(
-                ApiUrls.StatsPunchCard(owner, name), cancellationToken).ConfigureAwait(false);
+            var punchCardData = await ApiConnection.GetQueuedOperation<int[]>(ApiUrls.StatsPunchCard(owner, name), cancellationToken).ConfigureAwait(false);
             return new PunchCard(punchCardData);
         }
 
@@ -262,8 +255,7 @@ namespace Octokit
         /// <param name="cancellationToken">A token used to cancel this potentially long running request</param>
         public async Task<PunchCard> GetPunchCard(long repositoryId, CancellationToken cancellationToken)
         {
-            var punchCardData = await ApiConnection.GetQueuedOperation<int[]>(
-                ApiUrls.StatsPunchCard(repositoryId), cancellationToken).ConfigureAwait(false);
+            var punchCardData = await ApiConnection.GetQueuedOperation<int[]>(ApiUrls.StatsPunchCard(repositoryId), cancellationToken).ConfigureAwait(false);
             return new PunchCard(punchCardData);
         }
     }
diff --git a/Octokit/Http/HttpClientAdapter.cs b/Octokit/Http/HttpClientAdapter.cs
index d97092f6..24c56cca 100644
--- a/Octokit/Http/HttpClientAdapter.cs
+++ b/Octokit/Http/HttpClientAdapter.cs
@@ -174,7 +174,7 @@ namespace Octokit.Internal
         public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             // Clone the request/content incase we get a redirect
-            var clonedRequest = await CloneHttpRequestMessageAsync(request);
+            var clonedRequest = await CloneHttpRequestMessageAsync(request).ConfigureAwait(false);
 
             // Send initial response
             var response = await _http.SendAsync(request, HttpCompletionOption.ResponseContentRead, cancellationToken).ConfigureAwait(false);