diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala
index 10a0944147..683b86b09e 100755
--- a/akka-actor/src/main/scala/akka/actor/FSM.scala
+++ b/akka-actor/src/main/scala/akka/actor/FSM.scala
@@ -368,7 +368,7 @@ trait FSM[S, D] {
 
   private def applyState(nextState: State) = {
     currentState = nextState
-    val timeout = currentState.timeout orElse stateTimeouts(currentState.stateName)
+    val timeout = if (currentState.timeout.isDefined) currentState.timeout else stateTimeouts(currentState.stateName)
     if (timeout.isDefined) {
       val t = timeout.get
       if (t.length >= 0) {