diff --git a/src/runner/settings_window.cpp b/src/runner/settings_window.cpp
index f6316a7aff..8c95b0f99f 100644
--- a/src/runner/settings_window.cpp
+++ b/src/runner/settings_window.cpp
@@ -111,7 +111,6 @@ std::optional<std::wstring> dispatch_json_action_to_module(const json::JsonObjec
                 }
                 else if (action == L"check_for_updates")
                 {
-                    apply_general_settings(value);
                     bool expected_isUpdateCheckThreadRunning = false;
                     if (isUpdateCheckThreadRunning.compare_exchange_strong(expected_isUpdateCheckThreadRunning, true))
                     {
diff --git a/src/settings-ui/Settings.UI.UnitTests/ViewModelTests/Update.cs b/src/settings-ui/Settings.UI.UnitTests/ViewModelTests/Update.cs
index 1f34dce8f3..822c2a68c6 100644
--- a/src/settings-ui/Settings.UI.UnitTests/ViewModelTests/Update.cs
+++ b/src/settings-ui/Settings.UI.UnitTests/ViewModelTests/Update.cs
@@ -58,13 +58,17 @@ namespace ViewModelTests
         }
 
         [TestMethod]
-        public void CheckForUpdatesShouldShowProgressAndSendCurrentSettings()
+        public void CheckForUpdatesShouldShowProgressAndSendActionOnly()
         {
             string sentMessage = null;
             var generalSettings = new GeneralSettings
             {
                 IncludePrereleaseUpdates = true,
             };
+            generalSettings.Enabled.AlwaysOnTop = false;
+            generalSettings.Enabled.FancyZones = false;
+            generalSettings.Enabled.PowerLauncher = true;
+            var settingsBeforeCheck = generalSettings.ToJsonString();
             var viewModel = CreateViewModel(
                 new TestSettingsRepository(generalSettings),
                 new UpdatingSettings(),
@@ -80,9 +84,12 @@ namespace ViewModelTests
             Assert.IsTrue(viewModel.IsActivityVisible);
             Assert.IsFalse(viewModel.CanStartAction);
 
-            var action = JsonSerializer.Deserialize<GeneralSettingsCustomAction>(sentMessage);
-            Assert.IsTrue(action.GeneralSettingsAction.GeneralSettings.IncludePrereleaseUpdates);
-            Assert.AreEqual("check_for_updates", action.GeneralSettingsAction.GeneralSettings.CustomActionName);
+            using var message = JsonDocument.Parse(sentMessage);
+            var generalAction = message.RootElement.GetProperty("action").GetProperty("general");
+            Assert.AreEqual("check_for_updates", generalAction.GetProperty("action_name").GetString());
+            Assert.IsFalse(generalAction.TryGetProperty("enabled", out _));
+            Assert.IsFalse(generalAction.TryGetProperty("include_prerelease_updates", out _));
+            Assert.AreEqual(settingsBeforeCheck, generalSettings.ToJsonString());
         }
 
         [TestMethod]
diff --git a/src/settings-ui/Settings.UI/ViewModels/UpdateViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/UpdateViewModel.cs
index 622b5b9ad9..730188df98 100644
--- a/src/settings-ui/Settings.UI/ViewModels/UpdateViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/UpdateViewModel.cs
@@ -6,6 +6,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Abstractions;
+using System.Text.Json;
 using System.Threading;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
@@ -13,6 +14,7 @@ using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.SerializationContext;
 using Microsoft.UI.Dispatching;
 
 namespace Microsoft.PowerToys.Settings.UI.ViewModels
@@ -314,15 +316,15 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 return;
             }
 
-            var generalSettings = _settingsRepository.SettingsConfig;
-            generalSettings.CustomActionName = "check_for_updates";
-            var customAction = new GeneralSettingsCustomAction(new OutGoingGeneralSettings(generalSettings));
+            var checkForUpdatesAction = JsonSerializer.Serialize(
+                ActionMessage.Create("check_for_updates"),
+                SourceGenerationContextContext.Default.ActionMessage);
 
             RequestActivity();
             StartTransientOperation(TransientUpdateOperation.Checking);
             try
             {
-                if (_sendCheckForUpdatesConfigMessage(customAction.ToString()) != 0)
+                if (_sendCheckForUpdatesConfigMessage(checkForUpdatesAction) != 0)
                 {
                     FailTransientOperation(UpdateUIState.NetworkError, "Failed to send the update check request.");
                 }