diff --git a/src/libs/vehicle/common/data-flattener.ts b/src/libs/vehicle/common/data-flattener.ts
index 77456ac531..70650f14ea 100644
--- a/src/libs/vehicle/common/data-flattener.ts
+++ b/src/libs/vehicle/common/data-flattener.ts
@@ -85,26 +85,6 @@ export function flattenData(data: Record<string, unknown>): FlattenedPair[] {
   const messageName = data.type as string
   const messagePathWithId = getMessagePathWithId(messageName, data)
 
-  // Special handling for NAMED_VALUE_FLOAT messages
-  if (messageName === 'NAMED_VALUE_FLOAT') {
-    const name = (data.name as string[]).join('').replace(/\0/g, '')
-    return [
-      {
-        path: `${messagePathWithId}/${name}`,
-        type: 'number',
-        value: data.value as number,
-      },
-      ...Object.entries(data)
-        .filter(([key]) => !['name', 'value', 'type'].includes(key))
-        .map(([key, value]) => ({
-          path: `${messagePathWithId}/${key}`,
-          type: typeof value as 'string' | 'number' | 'boolean',
-          value: value as string | number | boolean,
-        })),
-    ]
-  }
-
-  // For all other messages
   return Object.entries(data)
     .filter(([key]) => key !== 'type')
     .flatMap(([key, value]) => {
diff --git a/src/libs/vehicle/mavlink/vehicle.ts b/src/libs/vehicle/mavlink/vehicle.ts
index cffc29c248..8321d9da30 100644
--- a/src/libs/vehicle/mavlink/vehicle.ts
+++ b/src/libs/vehicle/mavlink/vehicle.ts
@@ -1467,19 +1467,21 @@ export abstract class MAVLinkVehicle<Modes> extends Vehicle.AbstractVehicle<Mode
     const suffix = `(MAVLink / System: ${messageSystemId} / Component: ${messageComponentId})`
 
     // Inject variables from the MAVLink messages into the DataLake
-    if (['NAMED_VALUE_FLOAT', 'NAMED_VALUE_INT'].includes(messageType)) {
-      // Special handling for NAMED_VALUE_FLOAT/NAMED_VALUE_INT messages
+    if (messageType.startsWith('NAMED_VALUE_')) {
+      // Special handling for NAMED_VALUE_(FLOAT/INT/STRING) messages
       const name = `${(mavlinkPackage.message.name as string[]).join('').replace(/\0/g, '')}`
       const path = `${prefix}/${messageType}/${name}`
+      const isString = messageType == 'NAMED_VALUE_STRING'
       if (getDataLakeVariableInfo(path) === undefined) {
-        createDataLakeVariable({ id: path, name: `${name} ${suffix}`, type: 'number' })
+        createDataLakeVariable({ id: path, name: `${name} ${suffix}`, type: isString ? 'string' : 'number' })
       }
       setDataLakeVariableData(path, mavlinkPackage.message.value)
 
       if (
         this.shouldCreateLegacyDataLakeVariables &&
         messageSystemId === this.currentSystemId &&
-        messageComponentId === 1
+        messageComponentId === 1 &&
+        !isString
       ) {
         // Create duplicated variables for legacy purposes (that was how they were stored in the old generic-variables system)
         const oldVariablePath = mavlinkPackage.message.name.join('').replaceAll('\x00', '')