diff --git a/system/src/Commands/MailSendCommand.php b/system/src/Commands/MailSendCommand.php
index d0db7b69..35c00713 100644
--- a/system/src/Commands/MailSendCommand.php
+++ b/system/src/Commands/MailSendCommand.php
@@ -23,6 +23,11 @@ class MailSendCommand extends Command
 	{
 		$io = new SymfonyStyle($input, $output);
 
+		if (!setting('core.mail_enabled')) {
+			$io->error('Mailing is not enabled on this server');
+			return Command::FAILURE;
+		}
+
 		$email_account_name = $input->getArgument('recipient');
 		$subject = $input->getOption('subject');
 		if (!$subject) {