diff --git a/Keybinding.Test/InvalidStoredCommandEntryTests.cs b/Keybinding.Test/InvalidStoredCommandEntryTests.cs
new file mode 100644
index 0000000..a0649c1
--- /dev/null
+++ b/Keybinding.Test/InvalidStoredCommandEntryTests.cs
@@ -0,0 +1,72 @@
+// Copyright (c) 2023-2026 ktsu-dev contributors
+
+namespace ktsu.Keybinding.Test;
+
+using ktsu.Keybinding.Core;
+
+[TestClass]
+public class InvalidStoredCommandEntryTests
+{
+	private string _testDataDirectory = null!;
+
+	[TestInitialize]
+	public void Setup()
+	{
+		_testDataDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+		Directory.CreateDirectory(_testDataDirectory);
+	}
+
+	[TestCleanup]
+	public void Cleanup()
+	{
+		if (Directory.Exists(_testDataDirectory))
+		{
+			Directory.Delete(_testDataDirectory, recursive: true);
+		}
+	}
+
+	private async Task WriteCommandsAsync(string json) =>
+		await File.WriteAllTextAsync(Path.Combine(_testDataDirectory, "commands.json"), json).ConfigureAwait(false);
+
+	[TestMethod]
+	public async Task InitializeAsync_CorruptCommandsFile_LoadsNoCommands()
+	{
+		await WriteCommandsAsync("{not json").ConfigureAwait(false);
+
+		using KeybindingManager manager = new(_testDataDirectory);
+		await manager.InitializeAsync().ConfigureAwait(false);
+
+		Assert.IsEmpty(manager.Commands.GetAllCommands());
+	}
+
+	[TestMethod]
+	[DataRow("""[{"id":"file.save","name":"Save"},{"id":"file.open","name":""}]""", DisplayName = "Blank name")]
+	[DataRow("""[{"id":"file.save","name":"Save"},{"name":"Open"}]""", DisplayName = "Missing id")]
+	[DataRow("""[{"id":"file.save","name":"Save"},null]""", DisplayName = "Null entry")]
+	public async Task InitializeAsync_InvalidCommandEntry_SkipsOnlyThatEntry(string json)
+	{
+		await WriteCommandsAsync(json).ConfigureAwait(false);
+
+		using KeybindingManager manager = new(_testDataDirectory);
+		await manager.InitializeAsync().ConfigureAwait(false);
+
+		Assert.AreEqual("file.save", string.Join(',', manager.Commands.GetAllCommands().Select(c => c.Id)));
+	}
+
+	[TestMethod]
+	public async Task SaveAsync_AfterSkippingInvalidEntries_KeepsTheValidOnes()
+	{
+		await WriteCommandsAsync("""[{"id":"file.save","name":"Save"},null,{"id":"file.open","name":""}]""").ConfigureAwait(false);
+
+		{
+			using KeybindingManager manager = new(_testDataDirectory);
+			await manager.InitializeAsync().ConfigureAwait(false);
+			await manager.SaveAsync().ConfigureAwait(false);
+		}
+
+		using KeybindingManager reloaded = new(_testDataDirectory);
+		await reloaded.InitializeAsync().ConfigureAwait(false);
+
+		Assert.AreEqual("file.save", string.Join(',', reloaded.Commands.GetAllCommands().Select(c => c.Id)));
+	}
+}
diff --git a/Keybinding/Services/JsonKeybindingRepository.cs b/Keybinding/Services/JsonKeybindingRepository.cs
index 58a11d8..65f4f8a 100644
--- a/Keybinding/Services/JsonKeybindingRepository.cs
+++ b/Keybinding/Services/JsonKeybindingRepository.cs
@@ -224,10 +224,17 @@ public async Task<IReadOnlyCollection<Command>> LoadCommandsAsync()
 			string json = await File.ReadAllTextAsync(commandsPath).ConfigureAwait(false);
 			List<CommandDto> commandDtos = JsonSerializer.Deserialize<List<CommandDto>>(json, _jsonOptions) ?? [];
 
-			return commandDtos
-				.Select(dto => new Command(dto.Id, dto.Name, dto.Description, dto.Category))
-				.ToList()
-				.AsReadOnly();
+			List<Command> commands = [];
+			foreach (CommandDto? dto in commandDtos)
+			{
+				Command? command = ToCommand(dto);
+				if (command is not null)
+				{
+					commands.Add(command);
+				}
+			}
+
+			return commands.AsReadOnly();
 		}
 		catch (JsonException)
 		{
@@ -236,6 +243,29 @@ public async Task<IReadOnlyCollection<Command>> LoadCommandsAsync()
 		}
 	}
 
+	/// <summary>
+	/// Converts a stored command, skipping it when it is null or its id or name is invalid, so one
+	/// bad entry does not stop the rest of the file from loading. A skipped entry is not written back
+	/// by a later save.
+	/// </summary>
+	private static Command? ToCommand(CommandDto? dto)
+	{
+		if (dto is null)
+		{
+			return null;
+		}
+
+		try
+		{
+			return new(dto.Id, dto.Name, dto.Description, dto.Category);
+		}
+		catch (ArgumentException ex)
+		{
+			System.Diagnostics.Debug.WriteLine($"Skipping stored command '{dto.Id}': {ex.Message}");
+			return null;
+		}
+	}
+
 	/// <inheritdoc/>
 	public async Task SaveActiveProfileAsync(string? profileId)
 	{