diff --git a/src/common/components/PositionValue.jsx b/src/common/components/PositionValue.jsx
index ef1725bbea..a6d8171459 100644
--- a/src/common/components/PositionValue.jsx
+++ b/src/common/components/PositionValue.jsx
@@ -93,6 +93,10 @@ const PositionValue = ({ position, property, attribute }) => {
     }
   };
 
+  if (value === undefined) {
+    return '';
+  }
+
   switch (key) {
     case 'image':
     case 'video':
@@ -110,20 +114,11 @@ const PositionValue = ({ position, property, attribute }) => {
     case 'address':
       return <AddressValue latitude={position.latitude} longitude={position.longitude} originalAddress={value} />;
     case 'network':
-      if (value) {
-        return <Link component={RouterLink} underline="none" to={`/network/${position.id}`}>{t('sharedInfoTitle')}</Link>;
-      }
-      return '';
+      return <Link component={RouterLink} underline="none" to={`/network/${position.id}`}>{t('sharedInfoTitle')}</Link>;
     case 'geofenceIds':
-      if (value) {
-        return <GeofencesValue geofenceIds={value} />;
-      }
-      return '';
+      return <GeofencesValue geofenceIds={value} />;
     case 'driverUniqueId':
-      if (value) {
-        return <DriverValue driverUniqueId={value} />;
-      }
-      return '';
+      return <DriverValue driverUniqueId={value} />;
     default:
       return formatValue(value);
   }