diff --git a/change/react-native-windows-9b754faa-3023-4dbd-a53a-7c2ac8f2f26a.json b/change/react-native-windows-9b754faa-3023-4dbd-a53a-7c2ac8f2f26a.json new file mode 100644 index 00000000000..6c8855ded73 --- /dev/null +++ b/change/react-native-windows-9b754faa-3023-4dbd-a53a-7c2ac8f2f26a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Fix crash attempting to get runtime when shutting down instance", + "packageName": "react-native-windows", + "email": "30809111+acoates-ms@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/vnext/Microsoft.ReactNative.Cxx/NativeModules.h b/vnext/Microsoft.ReactNative.Cxx/NativeModules.h index e9afcef5b23..a0314573c63 100644 --- a/vnext/Microsoft.ReactNative.Cxx/NativeModules.h +++ b/vnext/Microsoft.ReactNative.Cxx/NativeModules.h @@ -527,7 +527,8 @@ struct ModuleJsiInitMethodInfo(module), method]( ReactContext const &reactContext, winrt::Windows::Foundation::IInspectable const &runtimeHandle) noexcept { - (module->*method)(reactContext, GetOrCreateContextRuntime(reactContext, runtimeHandle)); + if (runtimeHandle) + (module->*method)(reactContext, GetOrCreateContextRuntime(reactContext, runtimeHandle)); }; } };