diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs
index 2f989fd87..40ae61f90 100644
--- a/libs/hbb_common/src/config.rs
+++ b/libs/hbb_common/src/config.rs
@@ -931,7 +931,7 @@ impl PeerConfig {
                             .to_owned();
 
                         let id_decoded_string: String;
-                        if id.starts_with("base64_") && id != "base64_" {
+                        if id.starts_with("base64_") && id.len() != 7 {
                             let id_decoded = base64::decode(&id[7..], base64::Variant::Original)
                                 .unwrap_or(Vec::new());
                             id_decoded_string =