diff --git a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
index f0d330726d..9605324782 100644
--- a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
@@ -130,6 +130,7 @@ public class TenantActor extends RuleChainManagerActor {
         log.info("[{}] Stopping tenant actor.", tenantId);
         if (cfActor != null) {
             ctx.stop(cfActor.getActorId());
+            cfActor = null;
         }
     }
 
@@ -290,6 +291,7 @@ public class TenantActor extends RuleChainManagerActor {
             } else {
                 if (cfActor != null) {
                     ctx.stop(cfActor.getActorId());
+                    cfActor = null;
                 }
                 if (ruleChainsInitialized) {
                     log.info("Tenant {} is no longer managed by this service, stopping rule chains", tenantId);