diff --git a/src/cmap/handshake/client_metadata.ts b/src/cmap/handshake/client_metadata.ts
index 18bc1f8019b..45b1d5ddba5 100644
--- a/src/cmap/handshake/client_metadata.ts
+++ b/src/cmap/handshake/client_metadata.ts
@@ -173,14 +173,9 @@ export async function addContainerMetadata(originalMetadata: ClientMetadata) {
     }
     const isKubernetes = process.env.KUBERNETES_SERVICE_HOST ? true : false;
 
-    if (isDocker || isKubernetes) {
-      if (isDocker) {
-        containerMetadata['runtime'] = 'docker';
-      }
-      if (isKubernetes) {
-        containerMetadata['orchestrator'] = 'kubernetes';
-      }
-    }
+    if (isDocker) containerMetadata['runtime'] = 'docker';
+    if (isKubernetes) containerMetadata['orchestrator'] = 'kubernetes';
+
     return containerMetadata;
   }
 
@@ -188,11 +183,7 @@ export async function addContainerMetadata(originalMetadata: ClientMetadata) {
   if (Object.keys(containerMetadata).length === 0) return originalMetadata;
 
   const extendedMetadata = new LimitedSizeDocument(512);
-
-  let envMetadata = { container: containerMetadata };
-  if ('env' in originalMetadata) {
-    envMetadata = { ...originalMetadata['env'], ...envMetadata };
-  }
+  const envMetadata = { ...originalMetadata?.env, container: containerMetadata };
 
   for (const [key, val] of Object.entries(originalMetadata)) {
     if (key !== 'env') {