diff --git a/apps/admin-server/src/pages/projects/[project]/widgets/begrootmodule/[id]/display.tsx b/apps/admin-server/src/pages/projects/[project]/widgets/begrootmodule/[id]/display.tsx
index d45b6fe6c..91fdba461 100644
--- a/apps/admin-server/src/pages/projects/[project]/widgets/begrootmodule/[id]/display.tsx
+++ b/apps/admin-server/src/pages/projects/[project]/widgets/begrootmodule/[id]/display.tsx
@@ -263,7 +263,7 @@ export default function BegrootmoduleDisplay(
                         </FormControl>
                         <SelectContent>
                           {tagGroupNames?.map((item, index) => (
-                            <SelectItem value={item}>
+                            <SelectItem value={item} key={index}>
                               {item}
                             </SelectItem>
                           ))}
diff --git a/apps/admin-server/src/pages/projects/[project]/widgets/begrootmodule/[id]/text.tsx b/apps/admin-server/src/pages/projects/[project]/widgets/begrootmodule/[id]/text.tsx
index ee79bdc80..81f72c575 100644
--- a/apps/admin-server/src/pages/projects/[project]/widgets/begrootmodule/[id]/text.tsx
+++ b/apps/admin-server/src/pages/projects/[project]/widgets/begrootmodule/[id]/text.tsx
@@ -307,7 +307,7 @@ export default function BegrootmoduleText(
             name="budgetChosenTitle"
             render={({ field }) => (
               <FormItem className="col-span-1">
-                <FormLabel>'Gekozen' tekst</FormLabel>
+                <FormLabel>&apos;Gekozen&apos; tekst</FormLabel>
                 <FormDescription>Hier komt informatie bij te staan over hoeveel er al is gekozen.</FormDescription>
                 <FormControl>
                   <Input
@@ -327,7 +327,7 @@ export default function BegrootmoduleText(
             name="budgetRemainingTitle"
             render={({ field }) => (
               <FormItem className="col-span-1">
-                <FormLabel>'Nog over' tekst</FormLabel>
+                <FormLabel>&apos;Nog over&apos; tekst</FormLabel>
                 <FormDescription>Hier komt informatie bij te staan over hoeveel er nog gekozen kan worden.</FormDescription>
                 <FormControl>
                   <Input
diff --git a/packages/stem-begroot/src/stem-begroot.tsx b/packages/stem-begroot/src/stem-begroot.tsx
index 5b46aa593..3df92a65c 100644
--- a/packages/stem-begroot/src/stem-begroot.tsx
+++ b/packages/stem-begroot/src/stem-begroot.tsx
@@ -648,13 +648,13 @@ function StemBegroot({
           ) : null}
 
           {currentStep === 2 ? (
-            <Step3 loginUrl={`${props?.login?.url}`} step3={props.step3} stemCodeTitle={props.stemCodeTitle} />
+            <Step3 loginUrl={`${props?.login?.url}`} step3={props.step3 || ''} stemCodeTitle={props.stemCodeTitle} />
           ) : null}
 
           {currentStep === 3 ? (
             <Step3Success
               loginUrl={`${props?.login?.url}`}
-              step3success={props.step3success}
+              step3success={props.step3success || ''}
               stemCodeTitleSuccess={props.stemCodeTitleSuccess}
             />
           ) : null}
@@ -664,8 +664,8 @@ function StemBegroot({
           {currentStep === 4 ? (
             <Step4
               loginUrl={`${props?.login?.url}`}
-              thankMessage={props.thankMessage}
-              voteMessage={props.voteMessage}
+              thankMessage={props.thankMessage || ''}
+              voteMessage={props.voteMessage || ''}
               showNewsletterButton={props.showNewsletterButton}
               newsLetterTitle={props.newsLetterTitle}
             />
diff --git a/packages/stem-begroot/src/step-1/begroot-detail-dialog/stem-begroot-detail-dialog.tsx b/packages/stem-begroot/src/step-1/begroot-detail-dialog/stem-begroot-detail-dialog.tsx
index c132613dd..acb010fb7 100644
--- a/packages/stem-begroot/src/step-1/begroot-detail-dialog/stem-begroot-detail-dialog.tsx
+++ b/packages/stem-begroot/src/step-1/begroot-detail-dialog/stem-begroot-detail-dialog.tsx
@@ -115,6 +115,8 @@ export const StemBegrootResourceDetailDialog = ({
                           center={resource.location}
                           map={{'areaId': areaId}}
                           />
+                      } else {
+                        return <></>;
                       }
                     }}