diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index 10b3135bc9..62f34082da 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -615,7 +615,7 @@ class LocalActorRef private[akka] (private[this] val actorFactory: () ⇒ Actor,
           currentMessage = null
           Actor.registry.unregister(this)
 
-          if (isRemotingEnabled)
+          if (ClusterModule.isEnabled && isRemotingEnabled)
             Actor.remote.unregister(this)
 
           setActorSelfFields(actorInstance.get, null)
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala b/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
index d776b2c9b3..c6710d60ff 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
@@ -134,7 +134,7 @@ class LocalActorRegistry(
    */
   def shutdownAll() {
     foreach(_.stop)
-    if (RemoteModule.isEnabled) Actor.remote.clear //TODO: REVISIT: Should this be here?
+    if (ClusterModule.isEnabled) Actor.remote.clear //FIXME: Should this be here?
     actorsByAddress.clear
     actorsByUuid.clear
     typedActorsByUuid.clear
diff --git a/akka-actor/src/main/scala/akka/actor/Supervisor.scala b/akka-actor/src/main/scala/akka/actor/Supervisor.scala
index 9d32fdfd78..d20b8f31f4 100644
--- a/akka-actor/src/main/scala/akka/actor/Supervisor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Supervisor.scala
@@ -140,7 +140,7 @@ sealed class Supervisor(handler: FaultHandlingStrategy, maxRestartsHandler: (Act
             _childActors.put(className, actorRef :: currentActors)
             actorRef.lifeCycle = lifeCycle
             supervisor.link(actorRef)
-            if (registerAsRemoteService)
+            if (ClusterModule.isEnabled && registerAsRemoteService)
               Actor.remote.register(actorRef)
           case supervisorConfig@SupervisorConfig(_, _, _) ⇒ // recursive supervisor configuration
             val childSupervisor = Supervisor(supervisorConfig)