diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java
index 3c585074dfcc..60296242bbec 100755
--- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java
+++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java
@@ -253,6 +253,8 @@ protected Status validateSynch(final Connection connection, final String default
             }
         } catch (LiquibaseException e) {
             throw new RuntimeException("Failed to validate database", e);
+        } finally {
+            ThreadLocalSessionContext.removeCurrentSession();
         }
 
         return Status.VALID;
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java
index 4688fc2310f4..390201f3bd24 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java
@@ -251,6 +251,8 @@ public Status validate(Connection connection, String defaultSchema) {
             }
         } catch (LiquibaseException e) {
             throw new RuntimeException("Failed to validate database", e);
+        } finally {
+            ThreadLocalSessionContext.removeCurrentSession();
         }
 
         return Status.VALID;