diff --git a/pkgs/by-name/mo/moonlight/disable_updates.patch b/pkgs/by-name/mo/moonlight/disable_updates.patch
index a460c2d844d7..2d2429ac0cd8 100644
--- a/pkgs/by-name/mo/moonlight/disable_updates.patch
+++ b/pkgs/by-name/mo/moonlight/disable_updates.patch
@@ -26,7 +26,7 @@ index 6bb7b62..71b57b9 100644
  
        entries.splice(i + 1, 0, {
 diff --git i/packages/core-extensions/src/moonbase/native.ts w/packages/core-extensions/src/moonbase/native.ts
-index c6e068f..0adc765 100644
+index 51e347c..a6bdc58 100644
 --- i/packages/core-extensions/src/moonbase/native.ts
 +++ w/packages/core-extensions/src/moonbase/native.ts
 @@ -39,24 +39,7 @@ export default function getNatives(): MoonbaseNatives {
@@ -56,13 +56,13 @@ index c6e068f..0adc765 100644
  
      async updateMoonlight(overrideBranch?: MoonlightBranch) {
 diff --git i/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx w/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx
-index 133a98f..9414e7a 100644
+index 49d7fcb..a65b57c 100644
 --- i/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx
 +++ w/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx
-@@ -106,16 +106,6 @@ function ArrayFormItem({ config }: { config: "repositories" | "devSearchPaths" }
+@@ -107,16 +107,6 @@ function ArrayFormItem({ config }: { config: "repositories" | "devSearchPaths" }
  export default function ConfigPage() {
    return (
-     <>
+     <ErrorBoundary>
 -      <div className={Margins.marginTop20}>
 -        <FormSwitch
 -          checked={MoonbaseSettingsStore.getExtensionConfigRaw<boolean>("moonbase", "updateChecking", true) ?? true}
diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index c7cfd0907951..ede2467705d7 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
   stdenv,
-  pnpm_10,
+  pnpm,
   fetchPnpmDeps,
   pnpmConfigHook,
-  nodejs_22,
+  nodejs,
   fetchFromGitHub,
   nix-update-script,
   discord,
@@ -12,32 +12,27 @@
   discord-canary,
   discord-development,
 }:
-let
-  pnpm' = pnpm_10.override { nodejs = nodejs_22; };
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.33";
+  version = "1.3.37";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lQpl6ecQfQ7KzEIytH3k4hLtvq+KkTL+3IR2ZukdZWM=";
+    hash = "sha256-4cz1icY7i8RFdh/HhG/y6UzR/zkhsp4+G2dplm4g+wo=";
   };
 
   nativeBuildInputs = [
-    nodejs_22
+    nodejs
     pnpmConfigHook
-    pnpm'
+    pnpm
   ];
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm';
-
-    fetcherVersion = 2;
-    hash = "sha256-PRlgwyePFpFdQRcojGDEC4ESZEGTJf1Ad9EFgm8hmKY=";
+    fetcherVersion = 3;
+    hash = "sha256-sU0EBSNwpjqyBsvyJim8Qz90dht7xc6f52HaY0sBPds=";
   };
 
   env = {