diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
index 1e3417ed95..cb102ba30d 100644
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@@ -81,7 +81,8 @@ trait MessageDispatcher extends Logging {
     futures add invocation.uuid
     if (active.isOff) { active.switchOn { start } }
     invocation.future.onComplete { f =>
-      if ((futures remove invocation.uuid) && futures.isEmpty && uuids.isEmpty) {
+      futures remove invocation.uuid
+      if (futures.isEmpty && uuids.isEmpty) {
         shutdownSchedule match {
           case UNSCHEDULED =>
             shutdownSchedule = SCHEDULED