diff --git a/ErsatzTV.Application/Channels/Commands/UpdateChannelNumbersHandler.cs b/ErsatzTV.Application/Channels/Commands/UpdateChannelNumbersHandler.cs
index 4170ca763..c28cc3a59 100644
--- a/ErsatzTV.Application/Channels/Commands/UpdateChannelNumbersHandler.cs
+++ b/ErsatzTV.Application/Channels/Commands/UpdateChannelNumbersHandler.cs
@@ -39,7 +39,14 @@ public class UpdateChannelNumbersHandler(
             foreach (var channel in channelsToUpdate)
             {
                 channel.Number = numberUpdates[channel.Id];
-                channel.SortNumber = double.Parse(numberUpdates[channel.Id], CultureInfo.InvariantCulture);
+                if (double.TryParse(channel.Number, CultureInfo.InvariantCulture, out double sortNumber))
+                {
+                    channel.SortNumber = sortNumber;
+                }
+                else
+                {
+                    return BaseError.New($"Failed to parse channel number {channel.Number}");
+                }
             }
 
             // save those changes