diff --git a/lib/Chat/Command/Executor.php b/lib/Chat/Command/Executor.php
index 111655d586c..d48fef5f32d 100644
--- a/lib/Chat/Command/Executor.php
+++ b/lib/Chat/Command/Executor.php
@@ -126,6 +126,10 @@ protected function execHelp(Room $room, IComment $message, string $arguments): s
 			}
 		}
 
+		if (empty($helps)) {
+			return $this->l->t('There are currently no commands available.');
+		}
+
 		// FIXME Implement a useful help
 		return implode("\n", $helps);
 	}