diff --git a/layouts/_default/cli.html b/layouts/_default/cli.html
index d7dc614d10..e9e4fbc8e1 100644
--- a/layouts/_default/cli.html
+++ b/layouts/_default/cli.html
@@ -85,7 +85,12 @@
             <tr>
               <td>{{ with .option }}<code>--{{ . }}</code>{{ end }}</td>
               <td>{{ with .shorthand }}<code>-{{ . }}</code>{{ end }}</td>
-              <td>{{ with .default_value }}<code>{{ . }}</code>{{ end }}</td>
+              {{ $skipDefault := `[],map[],false,0,0s,default,'',""` }}
+              <td>
+                {{ with .default_value }}
+                  {{ cond (in $skipDefault .) "" (printf "<code>%s</code>" . | safeHTML) }}
+                {{ end }}
+              </td>
               <td>
                 {{ with .min_api_version }}
                   {{ partial "components/badge.html" (dict "color" "blue" "content" (printf "API %s+" .)) }}