diff --git a/src/Tgstation.Server.Host/Components/Chat/Commands/ByondCommand.cs b/src/Tgstation.Server.Host/Components/Chat/Commands/ByondCommand.cs
index e24c20a699..f0c87ef4df 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Commands/ByondCommand.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Commands/ByondCommand.cs
@@ -47,19 +47,19 @@ namespace Tgstation.Server.Host.Components.Chat.Commands
 		}
 
 		/// <inheritdoc />
-		public Task<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken)
+		public ValueTask<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken)
 		{
 			if (arguments.Split(' ').Any(x => x.ToUpperInvariant() == "--ACTIVE"))
-				return Task.FromResult(new MessageContent
+				return ValueTask.FromResult(new MessageContent
 				{
 					Text = byondManager.ActiveVersion == null ? "None!" : String.Format(CultureInfo.InvariantCulture, "{0}.{1}", byondManager.ActiveVersion.Major, byondManager.ActiveVersion.Minor),
 				});
 			if (watchdog.Status == WatchdogStatus.Offline)
-				return Task.FromResult(new MessageContent
+				return ValueTask.FromResult(new MessageContent
 				{
 					Text = "Server offline!",
 				});
-			return Task.FromResult(new MessageContent
+			return ValueTask.FromResult(new MessageContent
 			{
 				Text = watchdog.ActiveCompileJob?.ByondVersion ?? "None!",
 			});
diff --git a/src/Tgstation.Server.Host/Components/Chat/Commands/CustomCommand.cs b/src/Tgstation.Server.Host/Components/Chat/Commands/CustomCommand.cs
index 5b3c368d67..617b1dba48 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Commands/CustomCommand.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Commands/CustomCommand.cs
@@ -37,7 +37,7 @@ namespace Tgstation.Server.Host.Components.Chat.Commands
 		}
 
 		/// <inheritdoc />
-		public Task<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken)
+		public ValueTask<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken)
 		{
 			if (handler == null)
 				throw new InvalidOperationException("SetHandler() has not been called!");
diff --git a/src/Tgstation.Server.Host/Components/Chat/Commands/ICommand.cs b/src/Tgstation.Server.Host/Components/Chat/Commands/ICommand.cs
index d66df87476..766f29b6c0 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Commands/ICommand.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Commands/ICommand.cs
@@ -31,7 +31,7 @@ namespace Tgstation.Server.Host.Components.Chat.Commands
 		/// <param name="arguments">The text after <see cref="Name"/> with leading whitespace trimmed.</param>
 		/// <param name="user">The <see cref="ChatUser"/> who invoked the command.</param>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
-		/// <returns>A <see cref="Task{TResult}"/> resulting in a <see cref="MessageContent"/> to send to the invoker.</returns>
-		Task<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken);
+		/// <returns>A <see cref="ValueTask{TResult}"/> resulting in a <see cref="MessageContent"/> to send to the invoker.</returns>
+		ValueTask<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken);
 	}
 }
diff --git a/src/Tgstation.Server.Host/Components/Chat/Commands/KekCommand.cs b/src/Tgstation.Server.Host/Components/Chat/Commands/KekCommand.cs
index cde083b38c..a41278ae0a 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Commands/KekCommand.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Commands/KekCommand.cs
@@ -25,7 +25,7 @@ namespace Tgstation.Server.Host.Components.Chat.Commands
 		public bool AdminOnly => false;
 
 		/// <inheritdoc />
-		public Task<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken) => Task.FromResult(new MessageContent
+		public ValueTask<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken) => ValueTask.FromResult(new MessageContent
 		{
 			Text = Kek,
 		});
diff --git a/src/Tgstation.Server.Host/Components/Chat/Commands/PullRequestsCommand.cs b/src/Tgstation.Server.Host/Components/Chat/Commands/PullRequestsCommand.cs
index 409c989a64..39a99bcac4 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Commands/PullRequestsCommand.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Commands/PullRequestsCommand.cs
@@ -79,7 +79,7 @@ namespace Tgstation.Server.Host.Components.Chat.Commands
 		/// <inheritdoc />
 		// TODO: Decomplexify
 #pragma warning disable CA1506
-		public async Task<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken)
+		public async ValueTask<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken)
 		{
 			IEnumerable<Models.TestMerge> results = null;
 			var splits = arguments.Split(' ');
diff --git a/src/Tgstation.Server.Host/Components/Chat/Commands/RevisionCommand.cs b/src/Tgstation.Server.Host/Components/Chat/Commands/RevisionCommand.cs
index c0028964e2..aceff96435 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Commands/RevisionCommand.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Commands/RevisionCommand.cs
@@ -47,7 +47,7 @@ namespace Tgstation.Server.Host.Components.Chat.Commands
 		}
 
 		/// <inheritdoc />
-		public async Task<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken)
+		public async ValueTask<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken)
 		{
 			string result;
 			if (arguments.Split(' ').Any(x => x.ToUpperInvariant() == "--REPO"))
diff --git a/src/Tgstation.Server.Host/Components/Chat/Commands/VersionCommand.cs b/src/Tgstation.Server.Host/Components/Chat/Commands/VersionCommand.cs
index 08a7853c77..60e7f9e9a1 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Commands/VersionCommand.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Commands/VersionCommand.cs
@@ -36,7 +36,7 @@ namespace Tgstation.Server.Host.Components.Chat.Commands
 		}
 
 		/// <inheritdoc />
-		public Task<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken) => Task.FromResult(new MessageContent
+		public ValueTask<MessageContent> Invoke(string arguments, ChatUser user, CancellationToken cancellationToken) => ValueTask.FromResult(new MessageContent
 		{
 			Text = assemblyInformationProvider.VersionString,
 		});
diff --git a/src/Tgstation.Server.Host/Components/Chat/ICustomCommandHandler.cs b/src/Tgstation.Server.Host/Components/Chat/ICustomCommandHandler.cs
index e61a890cd8..bf406bb421 100644
--- a/src/Tgstation.Server.Host/Components/Chat/ICustomCommandHandler.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/ICustomCommandHandler.cs
@@ -17,7 +17,7 @@ namespace Tgstation.Server.Host.Components.Chat
 		/// <param name="arguments">Everything typed after <paramref name="commandName"/> minus leading spaces.</param>
 		/// <param name="sender">The sending <see cref="ChatUser"/>.</param>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
-		/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="MessageContent"/> text to send back.</returns>
-		Task<MessageContent> HandleChatCommand(string commandName, string arguments, ChatUser sender, CancellationToken cancellationToken);
+		/// <returns>A <see cref="ValueTask{TResult}"/> resulting in the <see cref="MessageContent"/> text to send back.</returns>
+		ValueTask<MessageContent> HandleChatCommand(string commandName, string arguments, ChatUser sender, CancellationToken cancellationToken);
 	}
 }
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
index 6df80546ca..a5eed5deaf 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
@@ -267,7 +267,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		}
 
 		/// <inheritdoc />
-		public async Task<MessageContent> HandleChatCommand(string commandName, string arguments, ChatUser sender, CancellationToken cancellationToken)
+		public async ValueTask<MessageContent> HandleChatCommand(string commandName, string arguments, ChatUser sender, CancellationToken cancellationToken)
 		{
 			using (await SemaphoreSlimContext.Lock(synchronizationSemaphore, cancellationToken))
 			{