diff --git a/src/Identity/Extensions.Core/src/AuthenticatorTokenProvider.cs b/src/Identity/Extensions.Core/src/AuthenticatorTokenProvider.cs
index 2d62fac47284..6a13b489a3db 100644
--- a/src/Identity/Extensions.Core/src/AuthenticatorTokenProvider.cs
+++ b/src/Identity/Extensions.Core/src/AuthenticatorTokenProvider.cs
@@ -64,6 +64,17 @@ public virtual async Task<bool> ValidateAsync(string purpose, string token, User
 #endif
 
         var timestep = Convert.ToInt64(unixTimestamp / 30);
+
+        var storedOtpTimestamp = await manager.GetAuthenticatorTimestampAsync(user).ConfigureAwait(false);
+
+        // Do not allow re-use of TOTP codes (Section 5.2 of RFC 6238).
+        if (storedOtpTimestamp.HasValue && storedOtpTimestamp >= timestep)
+        {
+            return false;
+        }
+
+        await manager.SetAuthenticatorTimestampAsync(user, timestep).ConfigureAwait(false);
+
         // Allow codes from 90s in each direction (we could make this configurable?)
         for (int i = -2; i <= 2; i++)
         {
diff --git a/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs b/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs
index bf3ba590ea1f..adae899c3bc7 100644
--- a/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs
+++ b/src/Identity/Extensions.Core/src/IUserAuthenticatorKeyStore.cs
@@ -24,8 +24,27 @@ public interface IUserAuthenticatorKeyStore<TUser> : IUserStore<TUser> where TUs
     /// <summary>
     /// Get the authenticator key for the specified <paramref name="user" />.
     /// </summary>
-    /// <param name="user">The user whose security stamp should be set.</param>
+    /// <param name="user">The user whose security stamp should be retrieved.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
     /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the security stamp for the specified <paramref name="user"/>.</returns>
     Task<string?> GetAuthenticatorKeyAsync(TUser user, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Get the last verified authenticator timestamp for the specified <paramref name="user" />.
+    /// </summary>
+    /// <param name="user">The user whose authenticator timestamp should be retrieved.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>
+    /// The <see cref="Task"/> that represents the asynchronous operation, containing the last verified authenticator timestamp for the specified <paramref name="user"/>,
+    /// or null, when the authenticator code has never been verified.</returns>
+    Task<long?> GetAuthenticatorTimestampAsync(TUser user, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Set the last verified authenticator timestamp for the specified <paramref name="user" />.
+    /// </summary>
+    /// <param name="user">The user whose authenticator timestamp should be set.</param>
+    /// <param name="timestamp">The new timestamp value to be set.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the security stamp for the specified <paramref name="user"/>.</returns>
+    Task SetAuthenticatorTimestampAsync(TUser user, long timestamp, CancellationToken cancellationToken);
 }
diff --git a/src/Identity/Extensions.Core/src/UserManager.cs b/src/Identity/Extensions.Core/src/UserManager.cs
index cca2005d10d0..84af0d442ec0 100644
--- a/src/Identity/Extensions.Core/src/UserManager.cs
+++ b/src/Identity/Extensions.Core/src/UserManager.cs
@@ -1983,6 +1983,34 @@ public virtual async Task<IdentityResult> ResetAuthenticatorKeyAsync(TUser user)
         return await UpdateAsync(user).ConfigureAwait(false);
     }
 
+    /// <summary>
+    /// Returns the authenticator last verified timestamp for the user.
+    /// </summary>
+    /// <param name="user">The user.</param>
+    /// <returns>The authenticator key</returns>
+    public virtual Task<long?> GetAuthenticatorTimestampAsync(TUser user)
+    {
+        ThrowIfDisposed();
+        var store = GetAuthenticatorKeyStore();
+        ArgumentNullThrowHelper.ThrowIfNull(user);
+        return store.GetAuthenticatorTimestampAsync(user, CancellationToken);
+    }
+
+    /// <summary>
+    /// Updates the authenticator last verified timestamp for the user.
+    /// </summary>
+    /// <param name="user">The user.</param>
+    /// <param name="timestamp">The timestamp to save.</param>
+    /// <returns>Whether the user was successfully updated.</returns>
+    public virtual async Task<IdentityResult> SetAuthenticatorTimestampAsync(TUser user, long timestamp)
+    {
+        ThrowIfDisposed();
+        var store = GetAuthenticatorKeyStore();
+        ArgumentNullThrowHelper.ThrowIfNull(user);
+        await store.SetAuthenticatorTimestampAsync(user, timestamp, CancellationToken).ConfigureAwait(false);
+        return await UpdateAsync(user).ConfigureAwait(false);
+    }
+
     /// <summary>
     /// Generates a new base32 encoded 160-bit security secret (size of SHA1 hash).
     /// </summary>
diff --git a/src/Identity/Extensions.Stores/src/UserStoreBase.cs b/src/Identity/Extensions.Stores/src/UserStoreBase.cs
index c45dd197e4a2..6c8edc7547e5 100644
--- a/src/Identity/Extensions.Stores/src/UserStoreBase.cs
+++ b/src/Identity/Extensions.Stores/src/UserStoreBase.cs
@@ -885,6 +885,7 @@ public virtual async Task RemoveTokenAsync(TUser user, string loginProvider, str
     private const string InternalLoginProvider = "[AspNetUserStore]";
     private const string AuthenticatorKeyTokenName = "AuthenticatorKey";
     private const string RecoveryCodeTokenName = "RecoveryCodes";
+    private const char AuthenticatorKeyTimestampSeparator = ';';
 
     /// <summary>
     /// Sets the authenticator key for the specified <paramref name="user"/>.
@@ -902,8 +903,60 @@ public virtual Task SetAuthenticatorKeyAsync(TUser user, string key, Cancellatio
     /// <param name="user">The user whose security stamp should be set.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
     /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the security stamp for the specified <paramref name="user"/>.</returns>
-    public virtual Task<string?> GetAuthenticatorKeyAsync(TUser user, CancellationToken cancellationToken)
-        => GetTokenAsync(user, InternalLoginProvider, AuthenticatorKeyTokenName, cancellationToken);
+    public virtual async Task<string?> GetAuthenticatorKeyAsync(TUser user, CancellationToken cancellationToken)
+    {
+        var token = await GetTokenAsync(user, InternalLoginProvider, AuthenticatorKeyTokenName, cancellationToken).ConfigureAwait(false);
+        return token?.Split(AuthenticatorKeyTimestampSeparator).First();
+    }
+
+    /// <summary>
+    /// Get the last verified authenticator timestamp for the specified <paramref name="user" />.
+    /// </summary>
+    /// <param name="user">The user whose authenticator timestamp should be retrieved.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>
+    /// The <see cref="Task"/> that represents the asynchronous operation, containing the last verified authenticator timestamp for the specified <paramref name="user"/>,
+    /// or null, when the authenticator code has never been verified.</returns>
+    public async Task<long?> GetAuthenticatorTimestampAsync(TUser user, CancellationToken cancellationToken)
+    {
+        var token = await GetTokenAsync(user, InternalLoginProvider, AuthenticatorKeyTokenName, cancellationToken).ConfigureAwait(false);
+        var keyParts = token?.Split(AuthenticatorKeyTimestampSeparator);
+
+        if (keyParts?.Length == 2)
+        {
+            if (long.TryParse(keyParts[1], out var timestamp))
+            {
+                return timestamp;
+            }
+
+            throw new InvalidOperationException("Invalid authenticator key and timestamp pair format");
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Set the last verified authenticator timestamp for the specified <paramref name="user" />.
+    /// </summary>
+    /// <param name="user">The user whose authenticator timestamp should be set.</param>
+    /// <param name="timestamp">The new timestamp value to be set.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
+    /// <returns>
+    /// <returns>The <see cref="Task"/> that represents the asynchronous operation, containing the security stamp for the specified <paramref name="user"/>.</returns>
+    public async Task SetAuthenticatorTimestampAsync(TUser user, long timestamp, CancellationToken cancellationToken)
+    {
+        var key = await GetAuthenticatorKeyAsync(user, cancellationToken).ConfigureAwait(false);
+
+        if (key != null)
+        {
+            var keyTimestampPair = $"{key}{AuthenticatorKeyTimestampSeparator}{timestamp}";
+            await base.SetAuthenticatorKeyAsync(user, keyTimestampPair, cancellationToken);
+        }
+        else
+        {
+            throw new InvalidOperationException("Unable to store authenticator timestamp - no authenticator key exists");
+        }
+    }
 
     /// <summary>
     /// Returns how many recovery code are still valid for a user.
diff --git a/src/Identity/test/InMemory.Test/InMemoryUserStore.cs b/src/Identity/test/InMemory.Test/InMemoryUserStore.cs
index 807e82e3f993..7e14bc67de16 100644
--- a/src/Identity/test/InMemory.Test/InMemoryUserStore.cs
+++ b/src/Identity/test/InMemory.Test/InMemoryUserStore.cs
@@ -393,6 +393,7 @@ public Task<string> GetTokenAsync(TUser user, string loginProvider, string name,
     private const string AuthenticatorStoreLoginProvider = "[AspNetAuthenticatorStore]";
     private const string AuthenticatorKeyTokenName = "AuthenticatorKey";
     private const string RecoveryCodeTokenName = "RecoveryCodes";
+    private const char AuthenticatorKeyTimestampSeparator = ';';
 
     public Task SetAuthenticatorKeyAsync(TUser user, string key, CancellationToken cancellationToken)
     {
@@ -401,7 +402,41 @@ public Task SetAuthenticatorKeyAsync(TUser user, string key, CancellationToken c
 
     public Task<string> GetAuthenticatorKeyAsync(TUser user, CancellationToken cancellationToken)
     {
-        return GetTokenAsync(user, AuthenticatorStoreLoginProvider, AuthenticatorKeyTokenName, cancellationToken);
+        var token = await GetTokenAsync(user, AuthenticatorStoreLoginProvider, AuthenticatorKeyTokenName, cancellationToken).ConfigureAwait(false);
+        return token?.Split(AuthenticatorKeyTimestampSeparator).First();
+    }
+
+    public async Task<long?> GetAuthenticatorTimestampAsync(TUser user, CancellationToken cancellationToken)
+    {
+        var token = await GetTokenAsync(user, AuthenticatorStoreLoginProvider, AuthenticatorKeyTokenName, cancellationToken).ConfigureAwait(false);
+        var keyParts = token?.Split(AuthenticatorKeyTimestampSeparator);
+
+        if (keyParts?.Length == 2)
+        {
+            if (long.TryParse(keyParts[1], out var timestamp))
+            {
+                return timestamp;
+            }
+
+            throw new InvalidOperationException("Invalid authenticator key and timestamp pair format");
+        }
+
+        return null;
+    }
+
+    public async Task SetAuthenticatorTimestampAsync(TUser user, long timestamp, CancellationToken cancellationToken)
+    {
+        var key = await GetAuthenticatorKeyAsync(user, cancellationToken).ConfigureAwait(false);
+
+        if (key != null)
+        {
+            var keyTimestampPair = $"{key}{AuthenticatorKeyTimestampSeparator}{timestamp}";
+            await base.SetAuthenticatorKeyAsync(user, keyTimestampPair, cancellationToken);
+        }
+        else
+        {
+            throw new InvalidOperationException("Unable to store authenticator timestamp - no authenticator key exists");
+        }
     }
 
     public Task ReplaceCodesAsync(TUser user, IEnumerable<string> recoveryCodes, CancellationToken cancellationToken)