diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index 95b8a990ad78..c093c945a23c 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -523,6 +523,12 @@ get_class(int *argc, char ***argv)
 	if (strcmp(comm, "geom") == 0) {
 		if (*argc < 2)
 			geom_usage();
+		else if (*argc == 2) {
+			if (strcmp((*argv)[1], "-h") == 0 ||
+			    strcmp((*argv)[1], "help") == 0) {
+				geom_usage();
+			}
+		}
 		strlcatf(comm, sizeof(comm), " %s", (*argv)[1]);
 		class_name = (*argv)[1];
 		*argc -= 2;