diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 4fa28a4ad9..896bbc2cb0 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -78,12 +78,14 @@ DEFINE_HOOK(isis_circuit_del_hook, (struct isis_circuit *circuit), (circuit));
 
 static void isis_circuit_enable(struct isis_circuit *circuit)
 {
-	struct isis_area *area;
+	struct isis_area *area = circuit->area;
 	struct interface *ifp = circuit->interface;
 
-	area = isis_area_lookup(circuit->tag, ifp->vrf_id);
-	if (area)
-		isis_area_add_circuit(area, circuit);
+	if (!area) {
+		area = isis_area_lookup(circuit->tag, ifp->vrf_id);
+		if (area)
+			isis_area_add_circuit(area, circuit);
+	}
 
 	if (if_is_operative(ifp))
 		isis_csm_state_change(IF_UP_FROM_Z, circuit, ifp);
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 77b18f9cf7..05d8741991 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -402,7 +402,7 @@ struct isis_area *isis_area_create(const char *area_tag, const char *vrf_name)
 				continue;
 
 			circuit = ifp->info;
-			if (circuit)
+			if (circuit && strmatch(circuit->tag, area->area_tag))
 				isis_area_add_circuit(area, circuit);
 		}
 	}