diff --git a/src/rust/long_term_stats/license_server/src/main.rs b/src/rust/long_term_stats/license_server/src/main.rs
index 436989dc..4c80412f 100644
--- a/src/rust/long_term_stats/license_server/src/main.rs
+++ b/src/rust/long_term_stats/license_server/src/main.rs
@@ -1,6 +1,7 @@
 use tracing_subscriber::fmt::format::FmtSpan;
 mod pki;
 mod server;
+mod token_expiration;
 
 fn set_console_logging() -> anyhow::Result<()> {
     // install global collector configured based on RUST_LOG env var.
@@ -39,6 +40,10 @@ async fn main() -> anyhow::Result<()> {
     // Start the logger
     set_console_logging().unwrap();
 
+    // Start the token expiration
+    tokio::spawn(token_expiration::token_expiration_loop(pool.clone()));
+
+    // Start the main server
     let _ = server::listen_accept(pool.clone()).await;
     Ok(())
 }
diff --git a/src/rust/long_term_stats/license_server/src/token_expiration.rs b/src/rust/long_term_stats/license_server/src/token_expiration.rs
new file mode 100644
index 00000000..8fcdea86
--- /dev/null
+++ b/src/rust/long_term_stats/license_server/src/token_expiration.rs
@@ -0,0 +1,20 @@
+use std::time::Duration;
+use pgdb::sqlx::{Postgres, Pool};
+
+pub async fn token_expiration_loop(pool: Pool<Postgres>) {
+    loop {
+        tracing::info!("Checking token expiration");
+        let mut interval = tokio::time::interval(Duration::from_secs(300));
+        interval.tick().await;
+        let result = check_token_expiration(&pool).await;
+        if let Err(e) = result {
+            tracing::error!("Error checking token expiration: {:?}", e);
+        }
+    }
+}
+
+#[tracing::instrument(skip(pool))]
+async fn check_token_expiration(pool: &Pool<Postgres>) -> anyhow::Result<()> {
+    pgdb::expire_tokens(pool).await?;
+    Ok(())
+}
\ No newline at end of file
diff --git a/src/rust/long_term_stats/pgdb/src/lib.rs b/src/rust/long_term_stats/pgdb/src/lib.rs
index ffb407bb..8752b338 100644
--- a/src/rust/long_term_stats/pgdb/src/lib.rs
+++ b/src/rust/long_term_stats/pgdb/src/lib.rs
@@ -19,7 +19,7 @@ pub use license::{get_stats_host_for_key, insert_or_update_node_public_key, fetc
 pub use organization::{OrganizationDetails, get_organization};
 pub use hosts::add_stats_host;
 pub use orchestrator::create_free_trial;
-pub use logins::{try_login, delete_user, add_user, refresh_token, token_to_credentials};
+pub use logins::{try_login, delete_user, add_user, refresh_token, token_to_credentials, expire_tokens};
 pub use nodes::{new_stats_arrived, node_status, NodeStatus};
 pub use search::*;
 pub use tree::*;
diff --git a/src/rust/long_term_stats/pgdb/src/logins/mod.rs b/src/rust/long_term_stats/pgdb/src/logins/mod.rs
index aab9f074..c6f63b6d 100644
--- a/src/rust/long_term_stats/pgdb/src/logins/mod.rs
+++ b/src/rust/long_term_stats/pgdb/src/logins/mod.rs
@@ -5,4 +5,4 @@ mod token_cache;
 
 pub use login::{LoginDetails, try_login};
 pub use add_del::{add_user, delete_user};
-pub use token_cache::{refresh_token, token_to_credentials};
\ No newline at end of file
+pub use token_cache::{refresh_token, token_to_credentials, expire_tokens};
\ No newline at end of file
diff --git a/src/rust/long_term_stats/pgdb/src/logins/token_cache.rs b/src/rust/long_term_stats/pgdb/src/logins/token_cache.rs
index 5320a808..c4f8f3b6 100644
--- a/src/rust/long_term_stats/pgdb/src/logins/token_cache.rs
+++ b/src/rust/long_term_stats/pgdb/src/logins/token_cache.rs
@@ -94,3 +94,17 @@ pub async fn token_to_credentials(
 
     Ok(details)
 }
+
+pub async fn expire_tokens(cnn: &Pool<Postgres>) -> Result<(), StatsHostError> {
+    sqlx::query("SELECT * FROM active_tokens WHERE expires < NOW()")
+        .execute(cnn)
+        .await
+        .map_err(|e| StatsHostError::DatabaseError(e.to_string()))?;
+
+    let ten_mins_ago = unix_now().unwrap_or(0) - 600;
+    TOKEN_CACHE.retain(|k, v| {
+        v.last_seen < ten_mins_ago
+    });
+
+    Ok(())
+}
\ No newline at end of file