diff --git a/apps/user_status/lib/Controller/UserStatusController.php b/apps/user_status/lib/Controller/UserStatusController.php
index 950cafb104..0ca82e84cb 100644
--- a/apps/user_status/lib/Controller/UserStatusController.php
+++ b/apps/user_status/lib/Controller/UserStatusController.php
@@ -135,10 +135,10 @@ class UserStatusController extends OCSController {
 	 * @throws OCSBadRequestException
 	 */
 	public function setCustomMessage(?string $statusIcon,
-									 string $message,
+									 ?string $message,
 									 ?int $clearAt): DataResponse {
 		try {
-			if ($message !== '') {
+			if ($message !== null && $message !== '') {
 				$status = $this->service->setCustomMessage($this->userId, $statusIcon, $message, $clearAt);
 			} else {
 				$this->service->clearMessage($this->userId);