diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
index 0d825deea9e76..dfbcc31ba81d7 100644
--- a/apps/files_sharing/lib/Controller/ShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -660,13 +660,10 @@ public function createShare(
 		// Handle mail send
 		if (is_null($sendMail)) {
 			// Define a default behavior when sendMail is not provided
-			if ($shareType === IShare::TYPE_EMAIL && strlen($shareWith) !== 0) {
-				// For email shares, the default is to send the mail
-				$share->setMailSend(true);
-			} else {
-				// For all other share types, the default is to not send the mail
-				$share->setMailSend(false);
-			}
+			// For email shares with a valid recipient, the default is to send the mail
+			// For all other share types, the default is to not send the mail
+			$allowSendMail = ($shareType === IShare::TYPE_EMAIL && $shareWith !== null && $shareWith !== '');
+			$share->setMailSend($allowSendMail);
 		} else {
 			$share->setMailSend($sendMail === 'true');
 		}