diff --git a/src/lib b/src/lib
index b1597d6..a8210ce 160000
--- a/src/lib
+++ b/src/lib
@@ -1 +1 @@
-Subproject commit b1597d6878a04d42de2d15798803e953705ab845
+Subproject commit a8210ce046af5927bc34bc80b0e677c8549b72f0
diff --git a/src/modules/features/SettingDialogue/PaneHatch.ts b/src/modules/features/SettingDialogue/PaneHatch.ts
index 9923e45..fa08b35 100644
--- a/src/modules/features/SettingDialogue/PaneHatch.ts
+++ b/src/modules/features/SettingDialogue/PaneHatch.ts
@@ -143,6 +143,9 @@ export function paneHatch(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement,
                     pluginConfig.jwtKid = redact(pluginConfig.jwtKid);
                     pluginConfig.bucketCustomHeaders = redact(pluginConfig.bucketCustomHeaders);
                     pluginConfig.couchDB_CustomHeaders = redact(pluginConfig.couchDB_CustomHeaders);
+                    pluginConfig.P2P_turnCredential = redact(pluginConfig.P2P_turnCredential);
+                    pluginConfig.P2P_turnUsername = redact(pluginConfig.P2P_turnUsername);
+                    pluginConfig.P2P_turnServers = `(${pluginConfig.P2P_turnServers.split(",").length} servers configured)`;
                     const endpoint = pluginConfig.endpoint;
                     if (endpoint == "") {
                         pluginConfig.endpoint = "Not configured or AWS";
diff --git a/src/modules/features/SetupWizard/dialogs/SetupRemoteP2P.svelte b/src/modules/features/SetupWizard/dialogs/SetupRemoteP2P.svelte
index 7b0c8e4..7cfe0fc 100644
--- a/src/modules/features/SetupWizard/dialogs/SetupRemoteP2P.svelte
+++ b/src/modules/features/SetupWizard/dialogs/SetupRemoteP2P.svelte
@@ -26,6 +26,7 @@
     import { onMount } from "svelte";
     import type { GuestDialogProps } from "../../../../lib/src/UI/svelteDialog";
     import { SETTING_KEY_P2P_DEVICE_NAME } from "../../../../lib/src/common/types";
+    import ExtraItems from "../../../../lib/src/UI/components/ExtraItems.svelte";
 
     const default_setting = pickP2PSyncSettings(DEFAULT_SETTINGS);
     let syncSetting = $state<P2PConnectionInfo>({ ...default_setting });
@@ -251,6 +252,46 @@
     If "Auto Broadcast Changes" is enabled, changes will be automatically broadcasted to connected peers without
     requiring manual intervention. This requests peers to fetch this device's changes.
 </InfoNote>
+<ExtraItems title="Advanced Settings">
+    <InfoNote>
+        TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P
+        connections. In most cases, you can leave these fields blank.
+    </InfoNote>
+    <InfoNote warning>
+        Using public TURN servers may have privacy implications, as your data will be relayed through third-party
+        servers. Even if your data are encrypted, your existence may be known to them. Please ensure you trust the TURN
+        server provider before using their services. Also your `network administrator` too. You should consider setting
+        up your own TURN server for your FQDN, if possible.
+    </InfoNote>
+    <InputRow label="TURN Server URLs (comma-separated)">
+        <textarea
+            name="p2p-turn-servers"
+            placeholder="turn:turn.example.com:3478,turn:turn.example.com:443"
+            autocapitalize="off"
+            spellcheck="false"
+            bind:value={syncSetting.P2P_turnServers}
+            rows="5"
+        ></textarea>
+    </InputRow>
+    <InputRow label="TURN Username">
+        <input
+            type="text"
+            name="p2p-turn-username"
+            placeholder="Enter TURN username"
+            autocorrect="off"
+            autocapitalize="off"
+            spellcheck="false"
+            bind:value={syncSetting.P2P_turnUsername}
+        />
+    </InputRow>
+    <InputRow label="TURN Credential">
+        <Password
+            name="p2p-turn-credential"
+            placeholder="Enter TURN credential"
+            bind:value={syncSetting.P2P_turnCredential}
+        />
+    </InputRow>
+</ExtraItems>
 <InfoNote error visible={error !== ""}>
     {error}
 </InfoNote>