diff --git a/java/google/registry/monitoring/whitebox/EppMetric.java b/java/google/registry/monitoring/whitebox/EppMetric.java
index 832d6f9f6..7ca133f3f 100644
--- a/java/google/registry/monitoring/whitebox/EppMetric.java
+++ b/java/google/registry/monitoring/whitebox/EppMetric.java
@@ -69,11 +69,11 @@ public abstract class EppMetric implements BigQueryMetric {
         requestId,
         startTimestamp,
         endTimestamp,
-        Optional.ofNullable(commandName),
-        Optional.ofNullable(clientId),
-        Optional.ofNullable(privilegeLevel),
-        Optional.ofNullable(eppTarget),
-        Optional.ofNullable(status),
+        Optional.fromNullable(commandName),
+        Optional.fromNullable(clientId),
+        Optional.fromNullable(privilegeLevel),
+        Optional.fromNullable(eppTarget),
+        Optional.fromNullable(status),
         attempts);
   }