diff --git a/packages/eve-contracts/dist/index.js b/packages/eve-contracts/dist/index.js
index 4fb1dea..9f1eda6 100644
--- a/packages/eve-contracts/dist/index.js
+++ b/packages/eve-contracts/dist/index.js
@@ -108,8 +108,8 @@ function normalizeSurfaceAdvertisement(value) {
         schema: value[1],
         recordRef: value[2],
         transport: value[3],
-        status: value[4],
-        surfaceKind: value[5],
+        ...(value[4] ? { status: value[4] } : {}),
+        ...(value[5] ? { surfaceKind: value[5] } : {}),
         ...(value[6] ? { worldInteraction: normalizeWorldInteraction(value[6]) } : {}),
     };
 }
diff --git a/packages/eve-contracts/src/index.ts b/packages/eve-contracts/src/index.ts
index 1e7a456..450e0b6 100644
--- a/packages/eve-contracts/src/index.ts
+++ b/packages/eve-contracts/src/index.ts
@@ -162,8 +162,8 @@ function normalizeSurfaceAdvertisement(value: unknown): unknown {
     schema: value[1],
     recordRef: value[2],
     transport: value[3],
-    status: value[4],
-    surfaceKind: value[5],
+    ...(value[4] ? { status: value[4] } : {}),
+    ...(value[5] ? { surfaceKind: value[5] } : {}),
     ...(value[6] ? { worldInteraction: normalizeWorldInteraction(value[6]) } : {}),
   };
 }