diff --git a/src/plugins/logger/logger.c b/src/plugins/logger/logger.c
index da668fea4..9188cfdf3 100644
--- a/src/plugins/logger/logger.c
+++ b/src/plugins/logger/logger.c
@@ -887,28 +887,26 @@ logger_command_cb (void *data, struct t_gui_buffer *buffer,
         return WEECHAT_RC_OK;
     }
 
-    if (argc > 1)
+    if (weechat_strcasecmp (argv[1], "set") == 0)
     {
-        if (weechat_strcasecmp (argv[1], "set") == 0)
-        {
-            if (argc > 2)
-                logger_set_buffer (buffer, argv[2]);
-            return WEECHAT_RC_OK;
-        }
-
-        if (weechat_strcasecmp (argv[1], "flush") == 0)
-        {
-            logger_flush ();
-            return WEECHAT_RC_OK;
-        }
-
-        if (weechat_strcasecmp (argv[1], "disable") == 0)
-        {
-            logger_set_buffer (buffer, "0");
-        }
+        if (argc > 2)
+            logger_set_buffer (buffer, argv[2]);
+        return WEECHAT_RC_OK;
     }
 
-    return WEECHAT_RC_OK;
+    if (weechat_strcasecmp (argv[1], "flush") == 0)
+    {
+        logger_flush ();
+        return WEECHAT_RC_OK;
+    }
+
+    if (weechat_strcasecmp (argv[1], "disable") == 0)
+    {
+        logger_set_buffer (buffer, "0");
+        return WEECHAT_RC_OK;
+    }
+
+    return WEECHAT_RC_ERROR;
 }
 
 /*