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',