diff --git a/src/ClientCommand.cpp b/src/ClientCommand.cpp
index 1ff01bf8..311b191c 100644
--- a/src/ClientCommand.cpp
+++ b/src/ClientCommand.cpp
@@ -1652,5 +1652,9 @@ void CClient::HelpUser(const CString& sFilter) {
 		AddCommandHelp(Table, "Restart", "[message]", "Restart ZNC", sFilter);
 	}
 
-	PutStatus(Table);
+	if (Table.empty()) {
+		PutStatus("No matches for '" + sFilter + "'");
+	} else {
+		PutStatus(Table);
+	}
 }
diff --git a/src/Modules.cpp b/src/Modules.cpp
index edd92453..20b0d6af 100644
--- a/src/Modules.cpp
+++ b/src/Modules.cpp
@@ -582,7 +582,11 @@ void CModule::HandleHelpCommand(const CString& sLine) {
 			it->second.AddHelp(Table);
 		}
 	}
-	PutModule(Table);
+	if (Table.empty()) {
+		PutModule("No matches for '" + sFilter + "'");
+	} else {
+		PutModule(Table);
+	}
 }
 
 CString CModule::GetModNick() const { return ((m_pUser) ? m_pUser->GetStatusPrefix() : "*") + m_sModName; }