diff --git a/cowrie/output/influx.py b/cowrie/output/influx.py
index e4c9d136..4a10ea49 100644
--- a/cowrie/output/influx.py
+++ b/cowrie/output/influx.py
@@ -159,11 +159,15 @@ class Output(cowrie.core.output.Output):
             })
 
         elif eventid == 'cowrie.client.version':
+            m['fields'].update({
+                'version': ','.join(entry['version']),
+            })
+
+        elif eventid == 'cowrie.client.kex':
             m['fields'].update({
                 'maccs': ','.join(entry['macCS']),
                 'kexalgs': ','.join(entry['kexAlgs']),
                 'keyalgs': ','.join(entry['keyAlgs']),
-                'version': ','.join(entry['version']),
                 'compcs': ','.join(entry['compCS']),
                 'enccs': ','.join(entry['encCS'])
             })