diff --git a/lib/yang.c b/lib/yang.c
index 03044fc29e9b..d71cb2f498c7 100644
--- a/lib/yang.c
+++ b/lib/yang.c
@@ -199,6 +199,16 @@ int yang_snodes_iterate_subtree(const struct lysc_node *snode,
 		if (ret == YANG_ITER_STOP)
 			return ret;
 	}
+	LY_LIST_FOR ((const struct lysc_node *)lysc_node_notifs(snode), child) {
+		ret = yang_snodes_iterate_subtree(child, module, cb, flags, arg);
+		if (ret == YANG_ITER_STOP)
+			return ret;
+	}
+	LY_LIST_FOR ((const struct lysc_node *)lysc_node_actions(snode), child) {
+		ret = yang_snodes_iterate_subtree(child, module, cb, flags, arg);
+		if (ret == YANG_ITER_STOP)
+			return ret;
+	}
 	return ret;
 }