diff --git a/backend/pkg/utils/ips/templates/includes/observation-value.gohtml b/backend/pkg/utils/ips/templates/includes/observation-value.gohtml
index c92aa81f..cdfc7463 100644
--- a/backend/pkg/utils/ips/templates/includes/observation-value.gohtml
+++ b/backend/pkg/utils/ips/templates/includes/observation-value.gohtml
@@ -16,9 +16,14 @@
 
 
     {{range $index, $text := $componentCodeText }}
-        {{$text}} - {{index $componentValueQuantity $index}}
+        {{$text}}
+        {{if lt $index (len $componentValueQuantity)}}
+            - {{index $componentValueQuantity $index}}
+        {{end}}
         {{if (get $ "include_unit")}}
-            {{index $componentValueQuantityUnit $index}}
+            {{if lt $index (len $componentValueQuantityUnit)}}
+                {{index $componentValueQuantityUnit $index}}
+            {{end}}
         {{end}}
         <br/>
     {{end}}