diff --git a/cli-output/src/cli_output.rs b/cli-output/src/cli_output.rs
index 4c60e598fb..4c6673881d 100644
--- a/cli-output/src/cli_output.rs
+++ b/cli-output/src/cli_output.rs
@@ -1685,6 +1685,7 @@ pub struct CliUpgradeableBuffer {
     pub authority: String,
     pub data_len: usize,
     pub lamports: u64,
+    #[serde(skip_serializing)]
     pub use_lamports_unit: bool,
 }
 impl QuietDisplay for CliUpgradeableBuffer {}
@@ -1713,6 +1714,7 @@ impl fmt::Display for CliUpgradeableBuffer {
 #[serde(rename_all = "camelCase")]
 pub struct CliUpgradeableBuffers {
     pub buffers: Vec<CliUpgradeableBuffer>,
+    #[serde(skip_serializing)]
     pub use_lamports_unit: bool,
 }
 impl QuietDisplay for CliUpgradeableBuffers {}
diff --git a/cli/src/program.rs b/cli/src/program.rs
index 8ecca1c7ee..96e28020c4 100644
--- a/cli/src/program.rs
+++ b/cli/src/program.rs
@@ -1385,21 +1385,15 @@ fn process_close(
                         authority_signer,
                     )?;
 
-                    if let Ok(UpgradeableLoaderState::Buffer { authority_address }) =
-                        account.state()
-                    {
-                        buffers.push(CliUpgradeableBuffer {
-                            address: account_pubkey.to_string(),
-                            authority: authority_address
-                                .map(|pubkey| pubkey.to_string())
-                                .unwrap_or_else(|| "none".to_string()),
-                            data_len: 0,
-                            lamports: account.lamports,
-                            use_lamports_unit,
-                        });
-                    } else {
-                        return Err(format!("Error parsing account {}", account_pubkey).into());
-                    }
+                    buffers.push(CliUpgradeableBuffer {
+                        address: account_pubkey.to_string(),
+                        authority: authority_address
+                            .map(|pubkey| pubkey.to_string())
+                            .unwrap_or_else(|| "none".to_string()),
+                        data_len: 0,
+                        lamports: account.lamports,
+                        use_lamports_unit,
+                    });
                 }
             } else {
                 return Err(format!(