diff --git a/include/znc/Message.h b/include/znc/Message.h
index 019710b7..1a3a92fe 100644
--- a/include/znc/Message.h
+++ b/include/znc/Message.h
@@ -29,7 +29,7 @@ class CIRCNetwork;
 class CMessage {
 public:
 	explicit CMessage(const CString& sMessage = "");
-	CMessage(const CNick& Nick, const CString& sCommand, const VCString& vsParams, const MCString& mssTags = MCString::EmptyMap);
+	CMessage(const CNick& Nick, const CString& sCommand, const VCString& vsParams = VCString(), const MCString& mssTags = MCString::EmptyMap);
 
 	// ZNC <-> IRC
 	CIRCNetwork* GetNetwork() const { return m_pNetwork; }
diff --git a/test/MessageTest.cpp b/test/MessageTest.cpp
index 7e1c93ed..39e6274f 100644
--- a/test/MessageTest.cpp
+++ b/test/MessageTest.cpp
@@ -45,12 +45,12 @@ TEST(MessageTest, ToString) {
 	EXPECT_EQ(":irc.znc.in CMD :p p p", CMessage(":irc.znc.in CMD :p p p").ToString());
 	EXPECT_EQ(":irc.znc.in CMD :", CMessage(":irc.znc.in CMD :").ToString());
 
-	EXPECT_EQ("CMD", CMessage(CNick(), "CMD", {}).ToString());
+	EXPECT_EQ("CMD", CMessage(CNick(), "CMD").ToString());
 	EXPECT_EQ("CMD p1", CMessage(CNick(), "CMD", {"p1"}).ToString());
 	EXPECT_EQ("CMD p1 p2", CMessage(CNick(), "CMD", {"p1", "p2"}).ToString());
 	EXPECT_EQ("CMD :p p p", CMessage(CNick(), "CMD", {"p p p"}).ToString());
-	EXPECT_EQ(":irc.znc.in", CMessage(CNick(":irc.znc.in"), "", {}).ToString());
-	EXPECT_EQ(":irc.znc.in CMD", CMessage(CNick(":irc.znc.in"), "CMD", {}).ToString());
+	EXPECT_EQ(":irc.znc.in", CMessage(CNick(":irc.znc.in"), "").ToString());
+	EXPECT_EQ(":irc.znc.in CMD", CMessage(CNick(":irc.znc.in"), "CMD").ToString());
 	EXPECT_EQ(":irc.znc.in CMD p1", CMessage(CNick(":irc.znc.in"), "CMD", {"p1"}).ToString());
 	EXPECT_EQ(":irc.znc.in CMD p1 p2", CMessage(CNick(":irc.znc.in"), "CMD", {"p1", "p2"}).ToString());
 	EXPECT_EQ(":irc.znc.in CMD :p p p", CMessage(CNick(":irc.znc.in"), "CMD", {"p p p"}).ToString());