diff --git a/src/builder/arg.rs b/src/builder/arg.rs
index 9866b842a9a..1c8639fa8c2 100644
--- a/src/builder/arg.rs
+++ b/src/builder/arg.rs
@@ -3984,6 +3984,14 @@ impl<'help> Arg<'help> {
         if val_names_len > 1 {
             self.settings.set(ArgSettings::MultipleValues);
             self.num_vals.get_or_insert(val_names_len.into());
+        } else {
+            if self.is_multiple_values_set() {
+                self.num_vals.get_or_insert((1..).into());
+            } else if self.is_takes_value_set() {
+                self.num_vals.get_or_insert(1.into());
+            } else {
+                self.num_vals.get_or_insert(0.into());
+            }
         }
     }
 
diff --git a/src/builder/debug_asserts.rs b/src/builder/debug_asserts.rs
index 54ab21382e6..483b961cdf1 100644
--- a/src/builder/debug_asserts.rs
+++ b/src/builder/debug_asserts.rs
@@ -692,12 +692,15 @@ fn assert_arg(arg: &Arg) {
 
     if let Some(num_vals) = arg.get_num_args() {
         // This can be the cause of later asserts, so put this first
-        let num_val_names = arg.get_value_names().unwrap_or(&[]).len();
-        if num_vals.max_values() < num_val_names {
-            panic!(
-                "Argument {}: Too many value names ({}) compared to number_of_values ({})",
-                arg.name, num_val_names, num_vals
-            );
+        if num_vals != 0.into() {
+            // HACK: Don't check for flags to make the derive easier
+            let num_val_names = arg.get_value_names().unwrap_or(&[]).len();
+            if num_vals.max_values() < num_val_names {
+                panic!(
+                    "Argument {}: Too many value names ({}) compared to number_of_values ({})",
+                    arg.name, num_val_names, num_vals
+                );
+            }
         }
 
         assert_eq!(