diff --git a/src/aws-cpp-sdk-core/source/auth/GeneralHTTPCredentialsProvider.cpp b/src/aws-cpp-sdk-core/source/auth/GeneralHTTPCredentialsProvider.cpp
index d809acdaff0..8e1a2814a99 100644
--- a/src/aws-cpp-sdk-core/source/auth/GeneralHTTPCredentialsProvider.cpp
+++ b/src/aws-cpp-sdk-core/source/auth/GeneralHTTPCredentialsProvider.cpp
@@ -122,7 +122,11 @@ bool GeneralHTTPCredentialsProvider::ShouldCreateGeneralHTTPProvider(const Aws::
                 shouldAllow = !addresses.empty();
                 hostResolved = true;
               }
-              hostResolverCV.notify_one();
+              else
+              {
+                std::unique_lock<std::mutex> lock(hostResolverMutex);
+                hostResolverCV.notify_one();
+              }
             };
           pHostResolver->ResolveHost(authority.c_str(), onHostResolved);
           std::unique_lock<std::mutex> lock(hostResolverMutex);
@@ -259,4 +263,4 @@ void GeneralHTTPCredentialsProvider::RefreshIfExpired()
     }
 
     Reload();
-}
\ No newline at end of file
+}