diff --git a/src/main/java/org/jlab/myquery/QueryController.java b/src/main/java/org/jlab/myquery/QueryController.java
index d0611a9..d89983d 100644
--- a/src/main/java/org/jlab/myquery/QueryController.java
+++ b/src/main/java/org/jlab/myquery/QueryController.java
@@ -108,7 +108,11 @@ public void writeLabeledEnumEvent(String name, JsonGenerator gen, LabeledEnumEve
         FormatUtil.writeTimestampJSON(gen, "d", event.getTimestampAsInstant(), formatAsMillisSinceEpoch, adjustMillisWithServerOffset, timestampFormatter);
 
         if (!event.getCode().isDisconnection()) {
-            gen.write("v", event.getLabel());
+            if(event.getLabel() == null) {
+                gen.write("v", event.getValue());
+            } else {
+                gen.write("v", event.getLabel());
+            }
         }
         writeDisconnectAndType(gen, event);