diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index b9ebf52505..ad1eca89e3 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1240,7 +1240,7 @@ isis_circuit_af_set (struct isis_circuit *circuit, bool ip_router, bool ipv6_rou
 {
   struct isis_area *area = circuit->area;
   bool change = circuit->ip_router != ip_router || circuit->ipv6_router != ipv6_router;
-  bool was_enabled = circuit->ip_router || circuit->ipv6_router;
+  bool was_enabled = !!circuit->area;
 
   area->ip_circuits   += ip_router   - circuit->ip_router;
   area->ipv6_circuits += ipv6_router - circuit->ipv6_router;