diff --git a/src/ttn_client/client.py b/src/ttn_client/client.py
index 1364271..9fb156f 100644
--- a/src/ttn_client/client.py
+++ b/src/ttn_client/client.py
@@ -103,6 +103,16 @@ async def __storage_api_call(self, options) -> DATA_TYPE:
                 # Get device_id and uplink_message from measurement
                 device_id = application_up["end_device_ids"]["device_id"]
 
-                ttn_values[device_id] = ttn_parse(application_up)
+                ttn_output = ttn_parse(application_up)
+
+                if ttn_output == {}:
+                    continue
+
+                _LOGGER.debug("TTN parsed values: %s", ttn_output)
+
+                if device_id in ttn_values:
+                    ttn_values[device_id] |= ttn_output
+                else:
+                    ttn_values[device_id] = ttn_output
 
         return ttn_values