diff --git a/libs/hbb_common/protos/message.proto b/libs/hbb_common/protos/message.proto
index 59f8b442d..442b3c355 100644
--- a/libs/hbb_common/protos/message.proto
+++ b/libs/hbb_common/protos/message.proto
@@ -202,6 +202,7 @@ message Clipboard {
 }
 
 enum FileType {
+  UnknownFileType = 0;
   Dir = 1;
   DirLink = 2;
   DirDrive = 3;
@@ -313,13 +314,14 @@ message SwitchDisplay {
   int32 height = 5;
 }
 
-enum Permission {
-  Keyboard = 1;
-  Clipboard = 2;
-  Audio = 3;
-}
-
 message PermissionInfo {
+  enum Permission {
+    Unknown = 0;
+    Keyboard = 1;
+    Clipboard = 2;
+    Audio = 3;
+  }
+
   Permission permission = 1;
   bool enabled = 2;
 }
@@ -331,13 +333,12 @@ enum ImageQuality {
   Best = 4;
 }
 
-enum BoolOption {
-  NotSet = 0;
-  No = 1;
-  Yes = 2;
-}
-
 message OptionMessage {
+  enum BoolOption {
+    NotSet = 0;
+    No = 1;
+    Yes = 2;
+  }
   ImageQuality image_quality = 1;
   BoolOption lock_after_session_end = 2;
   BoolOption show_remote_cursor = 3;
diff --git a/libs/hbb_common/protos/rendezvous.proto b/libs/hbb_common/protos/rendezvous.proto
index de81ed0f9..a6841c6d0 100644
--- a/libs/hbb_common/protos/rendezvous.proto
+++ b/libs/hbb_common/protos/rendezvous.proto
@@ -59,6 +59,7 @@ message RegisterPk {
 
 message RegisterPkResponse {
   enum Result {
+    UNKNOWN = 0;
     OK = 1;
     UUID_MISMATCH = 2;
     ID_EXISTS = 3;
@@ -74,6 +75,7 @@ message PunchHoleResponse {
   bytes socket_addr = 1;
   bytes pk = 2;
   enum Failure {
+    UNKNOWN = 0;
     ID_NOT_EXIST = 1;
     OFFLINE = 2;
     LICENSE_MISMATCH = 3;
diff --git a/src/client.rs b/src/client.rs
index 9089ba9e7..11a14b2ff 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -10,7 +10,7 @@ use hbb_common::{
     bail,
     config::{Config, PeerConfig, PeerInfoSerde, CONNECT_TIMEOUT, RELAY_PORT, RENDEZVOUS_TIMEOUT},
     log,
-    message_proto::*,
+    message_proto::{option_message::BoolOption, *},
     protobuf::Message as _,
     rendezvous_proto::*,
     socket_client,
diff --git a/src/server/connection.rs b/src/server/connection.rs
index 9b8c7d4fb..1251f8b8c 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -4,6 +4,7 @@ use hbb_common::{
     config::Config,
     fs,
     futures::{SinkExt, StreamExt},
+    message_proto::{option_message::BoolOption, permission_info::Permission},
     sleep, timeout,
     tokio::{
         net::TcpStream,
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index 4797b392a..50bc5fe6f 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -7,7 +7,7 @@ use hbb_common::{
     allow_err,
     config::{self, Config, PeerConfig},
     fs, log,
-    message_proto::*,
+    message_proto::{permission_info::Permission, *},
     protobuf::Message as _,
     rendezvous_proto::ConnType,
     sleep,
@@ -1705,6 +1705,7 @@ impl Remote {
                                 self.handler
                                     .call("setPermission", &make_args!("audio", p.enabled));
                             }
+                            _ => {}
                         }
                     }
                     Some(misc::Union::switch_display(s)) => {