diff --git a/notmuch-count.c b/notmuch-count.c
index 97242aba..39f08c6c 100644
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -90,7 +90,8 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
 	fprintf (stderr, "Out of memory.\n");
 	return 1;
     }
-    if (*query_str == '\0' || (*query_str == '*' && *(query_str+1) == '\0')) {
+
+    if (*query_str == '\0') {
 	query_str = talloc_strdup (ctx, "");
     }
 
diff --git a/notmuch.c b/notmuch.c
index 7e595e24..cde3c33b 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -223,12 +223,11 @@ command_t commands[] = {
       "\tof messages matching both a specific tag and either inbox\n"
       "\tor unread\n"
       "\n"
-      "\tIf no parameters are given, or the special search terms '' or\n"
-      "\t'*' are given, it will display the total number of messages in\n"
-      "\tthe database.\n"
+      "\tWith no search terms, a count of all messages in the database\n"
+      "\twill be displayed.\n"
       "\n"
       "\tSee \"notmuch help search-terms\" for details of the search\n"
-      "\t\tterms syntax." },
+      "\tterms syntax." },
     { "reply", notmuch_reply_command,
       "[options...] <search-terms> [...]",
       "Construct a reply template for a set of messages.",