diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 597a496d7..092a13003 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
                   branch: ${{env.BRANCH}}
                   force: true
                   tags: true
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v3
               if: failure()
               with:
                   name: cypress-videos
diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
index 04c8a38ec..46ae1adbf 100644
--- a/.github/workflows/dockerImage.yml
+++ b/.github/workflows/dockerImage.yml
@@ -58,7 +58,7 @@ jobs:
                   echo "127.0.0.1 localhost" | sudo tee -a /etc/hosts
                   echo "fs.inotify.max_user_watches=524288" | sudo tee -a /etc/sysctl.conf
                   npm run test:build
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               with:
                   name: buildfiles
                   path: build/**/*
@@ -86,7 +86,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
             - name: Download buildfiles artifact
-              uses: actions/download-artifact@v2
+              uses: actions/download-artifact@v4
               with:
                   name: buildfiles
                   path: build
diff --git a/src/extensions/components/registration/preselectionDrawer/preselectionDrawer.tsx b/src/extensions/components/registration/preselectionDrawer/preselectionDrawer.tsx
index dc88c4b6a..535e90dd8 100644
--- a/src/extensions/components/registration/preselectionDrawer/preselectionDrawer.tsx
+++ b/src/extensions/components/registration/preselectionDrawer/preselectionDrawer.tsx
@@ -155,28 +155,30 @@ export const PreselectionDrawer = () => {
 							/>
 						) : (
 							<>
-								<Typography
-									sx={{
-										color: 'white',
-										fontWeight: '600',
-										mt: '24px'
-									}}
-								>
-									{t('registration.topic.summary')}
-								</Typography>
+								{preselectedTopic || hasTopicError ? (
+									<Typography
+										sx={{
+											color: 'white',
+											fontWeight: '600',
+											mt: '24px'
+										}}
+									>
+										{t('registration.topic.summary')}
+									</Typography>
+								) : null}
 								{hasTopicError ? (
 									<PreselectionError
 										errorMessage={t(
 											'registration.errors.tid'
 										)}
 									/>
-								) : (
+								) : preselectedAgency ? (
 									<Typography
 										sx={{ color: 'white', mt: '8px' }}
 									>
-										{preselectedTopic.name}
+										{preselectedTopic?.name}
 									</Typography>
-								)}
+								) : null}
 								<Typography
 									sx={{
 										color: 'white',