diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 5c9275213..61571f04b 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -3301,6 +3301,13 @@ Widget buildPresetPasswordWarning() {
         return Text(
             'Error: ${snapshot.error}'); // Show an error message if the Future completed with an error
       } else if (snapshot.hasData && snapshot.data == true) {
+        final idServer =
+            bind.mainGetOptionSync(key: 'custom-rendezvous-server');
+        if (idServer.isNotEmpty &&
+            bind.mainGetLocalOption(key: "remove-preset-password-warning-of") ==
+                idServer) {
+          return SizedBox.shrink();
+        }
         return Container(
           color: Colors.yellow,
           child: Column(