diff --git a/sfputil/main.py b/sfputil/main.py
index 27a2552b3..b7a4672e1 100644
--- a/sfputil/main.py
+++ b/sfputil/main.py
@@ -1171,10 +1171,8 @@ def update_firmware_info_to_state_db(port_name):
             state_db.connect(state_db.STATE_DB)
             transceiver_firmware_info_dict = platform_chassis.get_sfp(physical_port).get_transceiver_info_firmware_versions()
             if transceiver_firmware_info_dict is not None:
-                active_firmware = transceiver_firmware_info_dict.get('active_firmware', 'N/A')
-                inactive_firmware = transceiver_firmware_info_dict.get('inactive_firmware', 'N/A')
-                state_db.set(state_db.STATE_DB, 'TRANSCEIVER_FIRMWARE_INFO|{}'.format(port_name), "active_firmware", active_firmware)
-                state_db.set(state_db.STATE_DB, 'TRANSCEIVER_FIRMWARE_INFO|{}'.format(port_name), "inactive_firmware", inactive_firmware)
+                for key, value in transceiver_firmware_info_dict.items():
+                    state_db.set(state_db.STATE_DB, 'TRANSCEIVER_FIRMWARE_INFO|{}'.format(port_name), key, value)
 
 # 'firmware' subgroup
 @cli.group()