From 25235a9c30e28d0569b3e4db1f3ffd012ee2df35 Mon Sep 17 00:00:00 2001
From: Brion <info@brionmario.com>
Date: Tue, 14 Oct 2025 19:12:19 +0530
Subject: [PATCH 1/2] fix: fix NPE

---
 packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx b/packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx
index e55d50adb..3f51f2156 100644
--- a/packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx
+++ b/packages/react/src/contexts/Asgardeo/AsgardeoProvider.tsx
@@ -469,7 +469,7 @@ const AsgardeoProvider: FC<PropsWithChildren<AsgardeoProviderProps>> = ({
           <ThemeProvider
             inheritFromBranding={preferences?.theme?.inheritFromBranding}
             theme={preferences?.theme?.overrides}
-            mode={getActiveTheme(preferences.theme.mode)}
+            mode={getActiveTheme(preferences?.theme?.mode)}
           >
             <FlowProvider>
               <UserProvider profile={userProfile} onUpdateProfile={handleProfileUpdate}>

From a7d68d33e0b4ad1de94ed1244c851e447a9654d2 Mon Sep 17 00:00:00 2001
From: Brion <info@brionmario.com>
Date: Tue, 14 Oct 2025 19:13:41 +0530
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20add=20changeset=20=F0=9F=A6=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changeset/yellow-wasps-return.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/yellow-wasps-return.md

diff --git a/.changeset/yellow-wasps-return.md b/.changeset/yellow-wasps-return.md
new file mode 100644
index 000000000..79e6a130e
--- /dev/null
+++ b/.changeset/yellow-wasps-return.md
@@ -0,0 +1,5 @@
+---
+'@asgardeo/react': patch
+---
+
+Fix NPE `ThemeProvider`