diff --git a/src/hdy-stackable-box.c b/src/hdy-stackable-box.c
index 9a5db7d50db1f85b83613801ff42f711e26020aa..dbee6a1ca6351ba3dd99a513e308b76a64f10b59 100644
--- a/src/hdy-stackable-box.c
+++ b/src/hdy-stackable-box.c
@@ -485,8 +485,10 @@ set_visible_child_info (HdyStackableBox               *self,
   /* If we are being destroyed, do not bother with transitions and
    * notifications.
    */
-  if (gtk_widget_in_destruction (widget))
+  if (gtk_widget_in_destruction (widget)) {
+    self->visible_child = NULL;
     return;
+  }
 
   /* If none, pick first visible. */
   if (new_visible_child == NULL) {