diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
index 8261a0f485..e63a72f366 100644
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@@ -95,7 +95,7 @@ trait MessageDispatcher {
   }
 
   private val futureCleanup: () => Unit = { () =>
-    if (futures.decrementAndGet() == 0 && uuids.isEmpty) {
+    if (futures.decrementAndGet() == 0) guard withGuard { if (uuids.isEmpty) {
       shutdownSchedule match {
         case UNSCHEDULED =>
           shutdownSchedule = SCHEDULED
@@ -104,7 +104,7 @@ trait MessageDispatcher {
           shutdownSchedule = RESCHEDULED
         case RESCHEDULED => //Already marked for reschedule
       }
-    }
+    }}
   }
 
   private[akka] def register(actorRef: ActorRef) {