diff --git a/ZNCString.cpp b/ZNCString.cpp
index ab952458..f24520fe 100644
--- a/ZNCString.cpp
+++ b/ZNCString.cpp
@@ -615,6 +615,10 @@ unsigned int CString::Split(const CString& sDelim, VCString& vsRet, bool bAllowE
 	}
 
 	if (!sTmp.empty()) {
+		if (bTrimWhiteSpace) {
+			sTmp.Trim();
+		}
+
 		vsRet.push_back(sTmp);
 	}