diff --git a/openid-connect-server-webapp/src/main/resources/db/hsql/hsql_database_tables.sql b/openid-connect-server-webapp/src/main/resources/db/hsql/hsql_database_tables.sql
index 2a0175629..dac84964c 100644
--- a/openid-connect-server-webapp/src/main/resources/db/hsql/hsql_database_tables.sql
+++ b/openid-connect-server-webapp/src/main/resources/db/hsql/hsql_database_tables.sql
@@ -7,11 +7,12 @@ CREATE TABLE IF NOT EXISTS access_token (
 	token_value VARCHAR(4096),
 	expiration TIMESTAMP,
 	token_type VARCHAR(256),
+	token_value_hash CHAR(64),
 	refresh_token_id BIGINT,
 	client_id BIGINT,
 	auth_holder_id BIGINT,
 	approved_site_id BIGINT,
-	UNIQUE(token_value)
+	UNIQUE(token_value_hash)
 );
 
 CREATE TABLE IF NOT EXISTS access_token_permissions (
diff --git a/openid-connect-server-webapp/src/main/resources/db/mysql/mysql_database_tables.sql b/openid-connect-server-webapp/src/main/resources/db/mysql/mysql_database_tables.sql
index 7e00cc876..a3fba496d 100644
--- a/openid-connect-server-webapp/src/main/resources/db/mysql/mysql_database_tables.sql
+++ b/openid-connect-server-webapp/src/main/resources/db/mysql/mysql_database_tables.sql
@@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS access_token (
 	token_value VARCHAR(4096),
 	expiration TIMESTAMP NULL,
 	token_type VARCHAR(256),
+	token_value_hash CHAR(64) AS (SHA2(token_value, 256)),
 	refresh_token_id BIGINT,
 	client_id BIGINT,
 	auth_holder_id BIGINT,