diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackInfoResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackInfoResponse.java
index 7c2886345470c..4d5c90ada4960 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackInfoResponse.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackInfoResponse.java
@@ -123,13 +123,15 @@ public License.Status getStatus() {
 
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-            return builder.startObject()
-                    .field("uid", uid)
-                    .field("type", type)
-                    .field("mode", mode)
-                    .field("status", status.label())
-                    .timeField("expiry_date_in_millis", "expiry_date", expiryDate)
-                    .endObject();
+            builder.startObject()
+                .field("uid", uid)
+                .field("type", type)
+                .field("mode", mode)
+                .field("status", status.label());
+            if (expiryDate != LicenseService.BASIC_SELF_GENERATED_LICENSE_EXPIRATION_MILLIS) {
+                builder.timeField("expiry_date_in_millis", "expiry_date", expiryDate);
+            }
+            return builder.endObject();
         }
 
         public void writeTo(StreamOutput out) throws IOException {