diff --git a/components/config-provider/index.tsx b/components/config-provider/index.tsx
index 45010abd31..02a9ce8c8d 100644
--- a/components/config-provider/index.tsx
+++ b/components/config-provider/index.tsx
@@ -506,7 +506,7 @@ const ProviderChildren: React.FC<ProviderChildrenProps> = (props) => {
 
   const config: ConfigConsumerProps = {
     ...parentContext,
-    themeOrigin: theme?.nextThemeEnd ? parentContext.theme : undefined,
+    themeOrigin: theme?.nextThemeEnd ? parentContext.themeOrigin || parentContext.theme : undefined,
   };
 
   (Object.keys(baseConfig) as (keyof typeof baseConfig)[]).forEach((key) => {