diff --git a/src/OpenIddict.Core/Caches/OpenIddictApplicationCache.cs b/src/OpenIddict.Core/Caches/OpenIddictApplicationCache.cs
index dc1e3f7b..07dd3020 100644
--- a/src/OpenIddict.Core/Caches/OpenIddictApplicationCache.cs
+++ b/src/OpenIddict.Core/Caches/OpenIddictApplicationCache.cs
@@ -378,11 +378,9 @@ namespace OpenIddict.Core
                 throw new InvalidOperationException("The application identifier cannot be extracted.");
             }
 
-            if (_signals.TryGetValue(identifier, out CancellationTokenSource signal))
+            if (_signals.TryRemove(identifier, out CancellationTokenSource signal))
             {
                 signal.Cancel();
-
-                _signals.TryRemove(identifier, out signal);
             }
         }
 
diff --git a/src/OpenIddict.Core/Caches/OpenIddictAuthorizationCache.cs b/src/OpenIddict.Core/Caches/OpenIddictAuthorizationCache.cs
index 2c748548..6509eedb 100644
--- a/src/OpenIddict.Core/Caches/OpenIddictAuthorizationCache.cs
+++ b/src/OpenIddict.Core/Caches/OpenIddictAuthorizationCache.cs
@@ -596,11 +596,9 @@ namespace OpenIddict.Core
                 throw new InvalidOperationException("The application identifier cannot be extracted.");
             }
 
-            if (_signals.TryGetValue(identifier, out CancellationTokenSource signal))
+            if (_signals.TryRemove(identifier, out CancellationTokenSource signal))
             {
                 signal.Cancel();
-
-                _signals.TryRemove(identifier, out signal);
             }
         }
 
diff --git a/src/OpenIddict.Core/Caches/OpenIddictScopeCache.cs b/src/OpenIddict.Core/Caches/OpenIddictScopeCache.cs
index a3d23453..710ce8e6 100644
--- a/src/OpenIddict.Core/Caches/OpenIddictScopeCache.cs
+++ b/src/OpenIddict.Core/Caches/OpenIddictScopeCache.cs
@@ -349,11 +349,9 @@ namespace OpenIddict.Core
                 throw new InvalidOperationException("The application identifier cannot be extracted.");
             }
 
-            if (_signals.TryGetValue(identifier, out CancellationTokenSource signal))
+            if (_signals.TryRemove(identifier, out CancellationTokenSource signal))
             {
                 signal.Cancel();
-
-                _signals.TryRemove(identifier, out signal);
             }
         }
 
diff --git a/src/OpenIddict.Core/Caches/OpenIddictTokenCache.cs b/src/OpenIddict.Core/Caches/OpenIddictTokenCache.cs
index 648ba381..1caef84e 100644
--- a/src/OpenIddict.Core/Caches/OpenIddictTokenCache.cs
+++ b/src/OpenIddict.Core/Caches/OpenIddictTokenCache.cs
@@ -679,11 +679,9 @@ namespace OpenIddict.Core
                 throw new InvalidOperationException("The application identifier cannot be extracted.");
             }
 
-            if (_signals.TryGetValue(identifier, out CancellationTokenSource signal))
+            if (_signals.TryRemove(identifier, out CancellationTokenSource signal))
             {
                 signal.Cancel();
-
-                _signals.TryRemove(identifier, out signal);
             }
         }