diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index d1092a7d0a..3e6342bf36 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -1323,8 +1323,7 @@ trait ScalaActorRef extends ActorRefShared { ref: ActorRef =>
           if (isMessageJoinPoint) throw e
           else None
       }
-      if (future.exception.isDefined) throw future.exception.get
-      else future.result
+      future.resultOrException
     } else throw new ActorInitializationException(
       "Actor has not been started, you need to invoke 'actor.start' before using it")
   }