diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt
index 17720af46af8c..5f8b8cc156801 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt
@@ -1,6 +1,5 @@
 package io.quarkus.hibernate.orm.panache.kotlin
 
-import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations
 import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations.implementationInjectionMissing
 import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.Companion.INSTANCE
 import io.quarkus.panache.common.Parameters
@@ -86,7 +85,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
     fun isPersistent(entity: Entity): Boolean = INSTANCE.isPersistent(entity)
 
     /**
-     * Flushes all pending changes to the database using the default EntityManager.
+     * Flushes all pending changes to the database using the EntityManager for the <Entity> entity class.
      */
     fun flush() {
         getEntityManager().flush()
diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java
index b286375f3c239..f2d68f285bd9e 100644
--- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java
+++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java
@@ -109,10 +109,10 @@ default boolean isPersistent(Entity entity) {
     }
 
     /**
-     * FFlushes all pending changes to the database using the default EntityManager.
+     * Flushes all pending changes to the database using the EntityManager for the <Entity> entity class.
      */
     default void flush() {
-        INSTANCE.getEntityManager().flush();
+        getEntityManager().flush();
     }
 
     // Queries