diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c
index 485be66f4..2217ef59c 100644
--- a/src/spicelib/devices/bsim4/b4set.c
+++ b/src/spicelib/devices/bsim4/b4set.c
@@ -2737,6 +2737,11 @@ CKTcircuit *ckt)
                 CKTdltNNum(ckt, here->BSIM4dbNode);
                 here->BSIM4dbNode = 0;
             }
+            if (here->BSIM4qNode)
+            {
+                CKTdltNNum(ckt, here->BSIM4qNode);
+                here->BSIM4qNode = 0;
+            }
         }
     }
 #endif
diff --git a/src/spicelib/devices/bsim4v5/b4v5set.c b/src/spicelib/devices/bsim4v5/b4v5set.c
index b02e6da1b..872fb2424 100644
--- a/src/spicelib/devices/bsim4v5/b4v5set.c
+++ b/src/spicelib/devices/bsim4v5/b4v5set.c
@@ -2163,6 +2163,11 @@ BSIM4v5unsetup(
                 CKTdltNNum(ckt, here->BSIM4v5dbNode);
                 here->BSIM4v5dbNode = 0;
             }
+            if (here->BSIM4v5qNode)
+            {
+                CKTdltNNum(ckt, here->BSIM4v5qNode);
+                here->BSIM4v5qNode = 0;
+            }
         }
     }
 #endif
diff --git a/src/spicelib/devices/bsim4v6/b4v6set.c b/src/spicelib/devices/bsim4v6/b4v6set.c
index e0354caf4..cd5d6f4e4 100644
--- a/src/spicelib/devices/bsim4v6/b4v6set.c
+++ b/src/spicelib/devices/bsim4v6/b4v6set.c
@@ -2499,6 +2499,12 @@ BSIM4v6unsetup(GENmodel *inModel, CKTcircuit *ckt)
                 CKTdltNNum(ckt, here->BSIM4v6dbNode);
                 here->BSIM4v6dbNode = 0;
             }
+
+            if (here->BSIM4v6qNode)
+            {
+                CKTdltNNum(ckt, here->BSIM4v6qNode);
+                here->BSIM4v6qNode = 0;
+            }
         }
     }
 #endif
diff --git a/src/spicelib/devices/bsim4v7/b4v7set.c b/src/spicelib/devices/bsim4v7/b4v7set.c
index 935e46844..0921e1955 100644
--- a/src/spicelib/devices/bsim4v7/b4v7set.c
+++ b/src/spicelib/devices/bsim4v7/b4v7set.c
@@ -2653,6 +2653,11 @@ CKTcircuit *ckt)
                 CKTdltNNum(ckt, here->BSIM4v7dbNode);
                 here->BSIM4v7dbNode = 0;
             }
+            if (here->BSIM4v7qNode)
+            {
+                CKTdltNNum(ckt, here->BSIM4v7qNode);
+                here->BSIM4v7qNode = 0;
+            }
         }
     }
 #endif