diff --git a/cmd-set-option.c b/cmd-set-option.c
index 64b78448..1a4df533 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -75,6 +75,7 @@ const char *set_option_bell_action_list[] = {
 
 const struct set_option_entry set_option_table[] = {
 	{ "quiet", SET_OPTION_FLAG, 0, 0, NULL },
+	{ NULL, 0, 0, 0, NULL }
 };
 
 const struct set_option_entry set_session_option_table[] = {
diff --git a/tmux.c b/tmux.c
index 209042af..540c6f9f 100644
--- a/tmux.c
+++ b/tmux.c
@@ -229,7 +229,7 @@ main(int argc, char **argv)
 	char			 cwd[MAXPATHLEN], **var;
 	void			*buf;
 	size_t			 len;
-	int	 		 opt, flags, quiet, cmdflags = 0;
+	int	 		 opt, flags, quiet = 0, cmdflags = 0;
 	short		 	 events;
 
 #ifdef DEBUG
@@ -316,7 +316,7 @@ main(int argc, char **argv)
 
 	options_init(&global_options, NULL);
 	oo = &global_options;
-	options_set_number(oo, "quiet", 0);
+	options_set_number(oo, "quiet", quiet);
 
 	options_init(&global_s_options, NULL);
 	so = &global_s_options;