diff --git a/src/vty/command.c b/src/vty/command.c
index ac731ee..4f47a6b 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -1600,6 +1600,9 @@
 		if (!cmd_element)
 			continue;
 
+		if (cmd_element->attr & (CMD_ATTR_DEPRECATED|CMD_ATTR_HIDDEN))
+			continue;
+
 		strvec = cmd_element->strvec;
 
 		/* if command is NULL, index may be equal to vector_active */