diff --git a/src/app/forms/custom-sections/tyres-section/tyres-section-summary/tyres-section-summary.component.html b/src/app/forms/custom-sections/tyres-section/tyres-section-summary/tyres-section-summary.component.html
index 150693c4e..a798de33e 100644
--- a/src/app/forms/custom-sections/tyres-section/tyres-section-summary/tyres-section-summary.component.html
+++ b/src/app/forms/custom-sections/tyres-section/tyres-section-summary/tyres-section-summary.component.html
@@ -28,12 +28,12 @@
         <ng-container *ngFor="let axle of vm.techRecord_axles; let i = index">
           <tr class="govuk-table__row" *ngIf="hasAxleChanged(i)">
             <th scope="row" class="govuk-table__header">T{{ axle.axleNumber }}</th>
-            <td class="govuk-table__cell">{{ axle.tyres_tyreCode }}</td>
-            <td class="govuk-table__cell">{{ axle.tyres_tyreSize }}</td>
-            <td class="govuk-table__cell">{{ axle.tyres_plyRating }}</td>
-            <td class="govuk-table__cell">{{ axle.tyres_dataTrAxles }}</td>
-            <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(axle).tyres_speedCategorySymbol }}</td>
-            <td class="govuk-table__cell">{{ axle.tyres_fitmentCode }}</td>
+            <td class="govuk-table__cell">{{ axle.tyres_tyreCode | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell">{{ axle.tyres_tyreSize | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell">{{ axle.tyres_plyRating | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell">{{ axle.tyres_dataTrAxles | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(axle).tyres_speedCategorySymbol | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell">{{ axle.tyres_fitmentCode | defaultNullOrEmpty  }}</td>
           </tr>
         </ng-container>
       </tbody>
diff --git a/src/app/forms/custom-sections/tyres-section/tyres-section-view/tyres-section-view.component.html b/src/app/forms/custom-sections/tyres-section/tyres-section-view/tyres-section-view.component.html
index c493959af..66d7497f5 100644
--- a/src/app/forms/custom-sections/tyres-section/tyres-section-view/tyres-section-view.component.html
+++ b/src/app/forms/custom-sections/tyres-section/tyres-section-view/tyres-section-view.component.html
@@ -36,15 +36,15 @@
         </thead>
         <tbody class="govuk-table__body">
           <tr class="govuk-table__row" *ngFor="let axle of vm.techRecord_axles; let i = index">
-            <th scope="row" class="govuk-table__header">T{{axle.axleNumber}}</th>
-            <td class="govuk-table__cell" id="tyres_tyreCode-{{ i + 1 }}">{{ axle.tyres_tyreCode }}</td>
-            <td class="govuk-table__cell" id="tyres_tyreSize-{{ i + 1 }}">{{ axle.tyres_tyreSize }}</td>
-            <td class="govuk-table__cell" id="tyres_plyRating-{{ i + 1 }}">{{ axle.tyres_plyRating }}</td>
-            <td class="govuk-table__cell" id="tyres_dataTrAxles-{{ i + 1 }}">{{ axle.tyres_dataTrAxles }}</td>
+            <th scope="row" class="govuk-table__header">T{{axle.axleNumber | defaultNullOrEmpty }}</th>
+            <td class="govuk-table__cell" id="tyres_tyreCode-{{ i + 1 }}">{{ axle.tyres_tyreCode | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell" id="tyres_tyreSize-{{ i + 1 }}">{{ axle.tyres_tyreSize | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell" id="tyres_plyRating-{{ i + 1 }}">{{ axle.tyres_plyRating | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell" id="tyres_dataTrAxles-{{ i + 1 }}">{{ axle.tyres_dataTrAxles | defaultNullOrEmpty  }}</td>
             <td class="govuk-table__cell uppercase" id="tyres_speedCategorySymbol-{{ i + 1 }}" *ngIf="vm.techRecord_vehicleType == VehicleTypes.PSV">
-              {{ $any(axle).tyres_speedCategorySymbol }}
+              {{ $any(axle).tyres_speedCategorySymbol | defaultNullOrEmpty  }}
             </td>
-            <td class="govuk-table__cell capitalize" id="tyres_fitmentCode-{{ i + 1 }}">{{ axle.tyres_fitmentCode }}</td>
+            <td class="govuk-table__cell capitalize" id="tyres_fitmentCode-{{ i + 1 }}">{{ axle.tyres_fitmentCode | defaultNullOrEmpty  }}</td>
           </tr>
         </tbody>
       </table>
diff --git a/src/app/forms/custom-sections/weights-section/weights-section-summary/weights-section-summary.component.html b/src/app/forms/custom-sections/weights-section/weights-section-summary/weights-section-summary.component.html
index 01b7dd832..9b6b47109 100644
--- a/src/app/forms/custom-sections/weights-section/weights-section-summary/weights-section-summary.component.html
+++ b/src/app/forms/custom-sections/weights-section/weights-section-summary/weights-section-summary.component.html
@@ -30,16 +30,16 @@
           <th scope="col" class="govuk-table__header">Axle {{ axle.axleNumber }}</th>
 
           <ng-container *ngIf="vm.techRecord_vehicleType === VehicleTypes.HGV || vm.techRecord_vehicleType === VehicleTypes.TRL">
-            <td class="govuk-table__cell">{{ axle.weights_gbWeight }}</td>
-            <td class="govuk-table__cell">{{ $any(axle).weights_eecWeight }}</td>
-            <td class="govuk-table__cell">{{ axle.weights_designWeight }}</td>
+            <td class="govuk-table__cell">{{ axle.weights_gbWeight | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell">{{ $any(axle).weights_eecWeight | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell">{{ axle.weights_designWeight | defaultNullOrEmpty  }}</td>
           </ng-container>
 
           <ng-container *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">
-            <td class="govuk-table__cell">{{ $any(axle).weights_kerbWeight }}</td>
-            <td class="govuk-table__cell">{{ $any(axle).weights_ladenWeight }}</td>
-            <td class="govuk-table__cell">{{ axle.weights_gbWeight }}</td>
-            <td class="govuk-table__cell">{{ axle.weights_designWeight }}</td>
+            <td class="govuk-table__cell">{{ $any(axle).weights_kerbWeight | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell">{{ $any(axle).weights_ladenWeight | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell">{{ axle.weights_gbWeight | defaultNullOrEmpty  }}</td>
+            <td class="govuk-table__cell">{{ axle.weights_designWeight | defaultNullOrEmpty  }}</td>
           </ng-container>
         </tr>
       </ng-container>
@@ -47,28 +47,28 @@
       <ng-container *ngIf="vm.techRecord_vehicleType === VehicleTypes.HGV || vm.techRecord_vehicleType === VehicleTypes.TRL">
         <tr class="govuk-table__row" *ngIf="hasHGVOrTRLGrossAxleChanged()">
           <th scope="col" class="govuk-table__header">Gross</th>
-          <td class="govuk-table__cell">{{ vm.techRecord_grossGbWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_grossEecWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_grossDesignWeight }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_grossGbWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_grossEecWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_grossDesignWeight | defaultNullOrEmpty  }}</td>
         </tr>
       </ng-container>
 
       <ng-container *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">
         <tr class="govuk-table__row" *ngIf="hasPsvGrossAxleChanged()">
           <th scope="col" class="govuk-table__header">Gross</th>
-          <td class="govuk-table__cell">{{ vm.techRecord_grossKerbWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_grossLadenWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_grossGbWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_grossDesignWeight }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_grossKerbWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_grossLadenWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_grossGbWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_grossDesignWeight | defaultNullOrEmpty  }}</td>
         </tr>
       </ng-container>
 
       <ng-container *ngIf="vm.techRecord_vehicleType === VehicleTypes.HGV">
         <tr class="govuk-table__row" *ngIf="hasHgvTrainAxleChanged()">
           <th scope="col" class="govuk-table__header">Train</th>
-          <td class="govuk-table__cell">{{ vm.techRecord_trainGbWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_trainEecWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_trainDesignWeight }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_trainGbWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_trainEecWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_trainDesignWeight | defaultNullOrEmpty  }}</td>
         </tr>
       </ng-container>
 
@@ -77,17 +77,17 @@
           <th scope="col" class="govuk-table__header">Train</th>
           <td class="govuk-table__cell"></td>
           <td class="govuk-table__cell"></td>
-          <td class="govuk-table__cell">{{ vm.techRecord_maxTrainGbWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_trainDesignWeight }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_maxTrainGbWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_trainDesignWeight | defaultNullOrEmpty  }}</td>
         </tr>
       </ng-container>
 
       <ng-container *ngIf="vm.techRecord_vehicleType === VehicleTypes.HGV">
         <tr class="govuk-table__row" *ngIf="hasMaxTrainAxleChanged()">
           <th scope="col" class="govuk-table__header">Max Train</th>
-          <td class="govuk-table__cell">{{ vm.techRecord_maxTrainGbWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_maxTrainEecWeight }}</td>
-          <td class="govuk-table__cell">{{ vm.techRecord_maxTrainDesignWeight }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_maxTrainGbWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_maxTrainEecWeight | defaultNullOrEmpty  }}</td>
+          <td class="govuk-table__cell">{{ vm.techRecord_maxTrainDesignWeight | defaultNullOrEmpty  }}</td>
         </tr>
       </ng-container>
     </tbody>
@@ -100,7 +100,7 @@
           Unladen Weight
         </dt>
         <dd class="govuk-summary-list__value">
-          {{ vm.techRecord_unladenWeight }} kg
+          {{ vm.techRecord_unladenWeight | defaultNullOrEmpty }} kg
         </dd>
       </div>
     </dl>
diff --git a/src/app/forms/custom-sections/weights-section/weights-section-view/weights-section-view.component.html b/src/app/forms/custom-sections/weights-section/weights-section-view/weights-section-view.component.html
index 5d1975104..fb12daaf3 100644
--- a/src/app/forms/custom-sections/weights-section/weights-section-view/weights-section-view.component.html
+++ b/src/app/forms/custom-sections/weights-section/weights-section-view/weights-section-view.component.html
@@ -16,34 +16,34 @@
       <tbody class="govuk-table__body">
       <tr class="govuk-table__row" *ngFor="let axle of vm.techRecord_axles">
         <th scope="row" class="govuk-table__header">Axle {{axle.axleNumber}}</th>
-        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(axle).weights_kerbWeight }}</td>
-        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(axle).weights_ladenWeight }}</td>
-        <td class="govuk-table__cell">{{ axle.weights_gbWeight }}</td>
-        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType !== VehicleTypes.PSV">{{ $any(axle).weights_eecWeight }}</td>
-        <td class="govuk-table__cell">{{ axle.weights_designWeight }}</td>
+        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(axle).weights_kerbWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(axle).weights_ladenWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell">{{ axle.weights_gbWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType !== VehicleTypes.PSV">{{ $any(axle).weights_eecWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell">{{ axle.weights_designWeight | defaultNullOrEmpty  }}</td>
       </tr>
       <tr>
         <th scope="row" class="govuk-table__header">Gross</th>
-        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(vm).techRecord_grossKerbWeight }}</td>
-        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(vm).techRecord_grossLadenWeight }}</td>
-        <td class="govuk-table__cell">{{ vm.techRecord_grossGbWeight }}</td>
-        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType !== VehicleTypes.PSV">{{ $any(vm).techRecord_grossEecWeight }}</td>
-        <td class="govuk-table__cell">{{ vm.techRecord_grossDesignWeight }}</td>
+        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(vm).techRecord_grossKerbWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(vm).techRecord_grossLadenWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell">{{ vm.techRecord_grossGbWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType !== VehicleTypes.PSV">{{ $any(vm).techRecord_grossEecWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell">{{ vm.techRecord_grossDesignWeight | defaultNullOrEmpty  }}</td>
       </tr>
       <tr  *ngIf="vm.techRecord_vehicleType !== VehicleTypes.TRL">
         <th scope="row" class="govuk-table__header">Train</th>
         <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV"></td>
         <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV"></td>
-        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType !== VehicleTypes.PSV">{{ $any(vm).techRecord_trainGbWeight }}</td>
-        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(vm).techRecord_maxTrainGbWeight }}</td>
-        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType !== VehicleTypes.PSV">{{ $any(vm).techRecord_trainEecWeight }}</td>
-        <td class="govuk-table__cell">{{ $any(vm).techRecord_trainDesignWeight }}</td>
+        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType !== VehicleTypes.PSV">{{ $any(vm).techRecord_trainGbWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType === VehicleTypes.PSV">{{ $any(vm).techRecord_maxTrainGbWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell" *ngIf="vm.techRecord_vehicleType !== VehicleTypes.PSV">{{ $any(vm).techRecord_trainEecWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell">{{ $any(vm).techRecord_trainDesignWeight | defaultNullOrEmpty  }}</td>
       </tr>
       <tr *ngIf="vm.techRecord_vehicleType === VehicleTypes.HGV">
         <th scope="row" class="govuk-table__header">Max Train</th>
-        <td class="govuk-table__cell">{{ vm.techRecord_maxTrainGbWeight }}</td>
-        <td class="govuk-table__cell">{{ vm.techRecord_maxTrainEecWeight }}</td>
-        <td class="govuk-table__cell">{{ $any(vm).techRecord_maxTrainDesignWeight }}</td>
+        <td class="govuk-table__cell">{{ vm.techRecord_maxTrainGbWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell">{{ vm.techRecord_maxTrainEecWeight | defaultNullOrEmpty  }}</td>
+        <td class="govuk-table__cell">{{ $any(vm).techRecord_maxTrainDesignWeight | defaultNullOrEmpty  }}</td>
       </tr>
       </tbody>
     </table>
@@ -52,7 +52,7 @@
     <div class="govuk-summary-list__row">
       <dt class="govuk-summary-list__key">Unladen weight</dt>
       <dd class="govuk-summary-list__value" id="test-techRecord_unladenWeight">
-        {{ vm.techRecord_unladenWeight | defaultNullOrEmpty }}
+        {{ vm.techRecord_unladenWeight | defaultNullOrEmpty }} kg
       </dd>
     </div>
   </dl>