diff --git a/src/ui/screens/benefit-page/components/BenefitPageHeader.js b/src/ui/screens/benefit-page/components/BenefitPageHeader.js
index d4791389..a8ec2588 100644
--- a/src/ui/screens/benefit-page/components/BenefitPageHeader.js
+++ b/src/ui/screens/benefit-page/components/BenefitPageHeader.js
@@ -6,7 +6,7 @@ import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
 import React, {useState} from "react";
 import {useStore} from "../../../shared-components/ViewportUpdater";
 import {Link} from "react-router-dom";
-import {useValidationReportStore} from "../../../storage/zustand";
+import {useSelectedBenefitStore, useSelectedTopicsStore, useValidationReportStore} from "../../../storage/zustand";
 import useIsMissingDataBenefit from "../hooks/useIsMissingDataBenefit";
 import useTranslation from "../../../language/useTranslation";
 
@@ -17,9 +17,11 @@ const BenefitPageHeader = ({id, benefit}) => {
     const isDesktop = useStore((state) => state.isDesktop);
     const titleFontSize = isDesktop ? '32px' : '28px';
 
+    const setSelectedBenefit = useSelectedBenefitStore((state) => state.setSelectedBenefit);
+    const clearSelectedTopics = useSelectedTopicsStore((state) => state.clear);
     const validationReport = useValidationReportStore((state) => state.validationReport);
-    const isMissingDataBenefit = useIsMissingDataBenefit(id, validationReport);
 
+    const isMissingDataBenefit = useIsMissingDataBenefit(id, validationReport);
 
     return (
         <VStack gap={0} alignItems={'flex-start'} sx={{
@@ -67,6 +69,10 @@ const BenefitPageHeader = ({id, benefit}) => {
                         <Box sx={{width: '100%', mb: 2}}>
                             <Button
                                 variant="contained"
+                                onClick={() => {
+                                    setSelectedBenefit(id);
+                                    clearSelectedTopics()
+                                }}
                                 sx={{
                                     backgroundColor: 'secondary.main',
                                     borderColor: 'secondary.main',
diff --git a/src/ui/screens/onboarding-welcome/OnboardingWelcomeOverview.js b/src/ui/screens/onboarding-welcome/OnboardingWelcomeOverview.js
index a840187b..50419ab5 100644
--- a/src/ui/screens/onboarding-welcome/OnboardingWelcomeOverview.js
+++ b/src/ui/screens/onboarding-welcome/OnboardingWelcomeOverview.js
@@ -45,7 +45,7 @@ const OnboardingWelcomeOverview = () => {
                             <VStack alignItems={'flex-start'}>
                                 <VStack gap={2} alignItems={'flex-start'}>
                                     <Typography variant="h6" sx={styles.listHeader}>
-                                        {getRpTitle()}
+                                        {metadata.rp && getRpTitle()}
                                     </Typography>
                                 </VStack>
                             </VStack>