diff --git a/libstdc++-v3/include/bits/atomic_wait.h b/libstdc++-v3/include/bits/atomic_wait.h
index 29b83cad6e6c..4a9652ed8f1d 100644
--- a/libstdc++-v3/include/bits/atomic_wait.h
+++ b/libstdc++-v3/include/bits/atomic_wait.h
@@ -392,13 +392,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __wait_args __args{ *__a };
       __waiter_pool_impl* __pool = nullptr;
 
-      if (__args & __wait_flags::__track_contention)
-	{
-	  __pool = &__waiter_pool_impl::_S_impl_for(__addr);
-	  if (!__pool->_M_waiting())
-	    return;
-	}
-
       const __platform_wait_t* __wait_addr;
       if (__args & __wait_flags::__proxy_wait)
 	{
@@ -416,6 +409,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       else // Use the atomic variable's own address.
 	__wait_addr = __addr;
 
+      if (__args & __wait_flags::__track_contention)
+	{
+	  __pool = &__waiter_pool_impl::_S_impl_for(__addr);
+	  if (!__pool->_M_waiting())
+	    return;
+	}
+
 #ifdef _GLIBCXX_HAVE_PLATFORM_WAIT
       __platform_notify(__wait_addr, __all);
 #else