diff --git a/frontend/src/lib/components/SelectedValues.svelte b/frontend/src/lib/components/SelectedValues.svelte
index 757ce665..672e79e9 100644
--- a/frontend/src/lib/components/SelectedValues.svelte
+++ b/frontend/src/lib/components/SelectedValues.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { SelectedValue } from '$lib/services/Libre311/Libre311';
 
-	export let selectedValues: SelectedValue[] = [];
+	export let selectedValues: SelectedValue[];
 </script>
 
 {#each selectedValues as selectedValue}
diff --git a/frontend/src/lib/components/ServiceRequestDetails.svelte b/frontend/src/lib/components/ServiceRequestDetails.svelte
index 38aaca41..f30886c2 100644
--- a/frontend/src/lib/components/ServiceRequestDetails.svelte
+++ b/frontend/src/lib/components/ServiceRequestDetails.svelte
@@ -58,10 +58,11 @@
 					<p class="text-sm">{serviceRequest.address}</p>
 				</div>
 
-				<div class="mb-1">
-					<SelectedValues selectedValues={serviceRequest.selected_values} />
-				</div>
-
+				{#if serviceRequest.selected_values}
+					<div class="mb-1">
+						<SelectedValues selectedValues={serviceRequest.selected_values} />
+					</div>
+				{/if}
 				{#if serviceRequest.description}
 					<div class="mb-1">
 						<strong class="text-base">{messages['serviceRequest']['description']}</strong>
diff --git a/frontend/src/lib/components/ServiceRequestUpdate.svelte b/frontend/src/lib/components/ServiceRequestUpdate.svelte
index 0f665663..83c45db8 100644
--- a/frontend/src/lib/components/ServiceRequestUpdate.svelte
+++ b/frontend/src/lib/components/ServiceRequestUpdate.svelte
@@ -175,9 +175,11 @@
 					<p class="text-sm">{serviceRequest.address}</p>
 				</div>
 
-				<div class="mb-1">
-					<SelectedValues selectedValues={serviceRequest.selected_values} />
-				</div>
+				{#if serviceRequest.selected_values}
+					<div class="mb-1">
+						<SelectedValues selectedValues={serviceRequest.selected_values} />
+					</div>
+				{/if}
 
 				{#if serviceRequest.description}
 					<div class="mb-1">