diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala
index 841b5b648f..e72734b881 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala
@@ -4,7 +4,6 @@
 
 package akka.actor.typed.internal
 
-import java.util.function.{ Function => JFunction }
 import scala.annotation.tailrec
 import scala.util.control.NonFatal
 import akka.actor.DeadLetter
@@ -15,10 +14,13 @@ import akka.actor.typed.javadsl
 import akka.actor.typed.scaladsl
 import akka.actor.typed.scaladsl.ActorContext
 import akka.annotation.{ InternalApi, InternalStableApi }
-import akka.japi.function.{ Predicate, Procedure }
+import akka.japi.function.Procedure
 import akka.util.{ unused, ConstantFun }
 import akka.util.OptionVal
 
+import java.util.function.{ Function => JFunction }
+import java.util.function.Predicate
+
 /**
  * INTERNAL API
  */
diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala
index ce8fc753b4..f476ca7e97 100644
--- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala
+++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/StashBuffer.scala
@@ -6,9 +6,9 @@ package akka.actor.typed.javadsl
 
 import akka.actor.typed.{ scaladsl, Behavior }
 import akka.annotation.DoNotInherit
-import akka.japi.function.{ Predicate, Procedure }
+import akka.japi.function.Procedure
 
-import java.util.function.{ Function => JFunction }
+import java.util.function.{ Predicate, Function => JFunction }
 
 /**
  * A non thread safe mutable message buffer that can be used to buffer messages inside actors