diff --git a/api/src/createLocalConfigFile.ts b/api/src/createLocalConfigFile.ts
index 91247048..9fcf92e5 100644
--- a/api/src/createLocalConfigFile.ts
+++ b/api/src/createLocalConfigFile.ts
@@ -43,7 +43,7 @@ async function getLocalIpWithRetries(retries: number): Promise<string> {
 async function getLocalIp(): Promise<string> {
   const dappmanagerHostnames = params.DAPPMANAGER_HOSTNAMES;
   const getLocalIpUrls = dappmanagerHostnames.map(
-    (hostname) => `http://${hostname}${params.GET_INTERNAL_IP_ENDPOINT}`
+    (hostname) => `http://${hostname}${params.GET_INTERNAL_IP_ENDPOINT}`,
   );
 
   let errorMessages: string[] = [];
@@ -57,7 +57,7 @@ async function getLocalIp(): Promise<string> {
       return localIp;
     } catch (e) {
       errorMessages.push(
-        `Local IP could not be fetched from ${url}: ${e.message}`
+        `Local IP could not be fetched from ${url}: ${e.message}`,
       );
     }
   }
@@ -66,12 +66,12 @@ async function getLocalIp(): Promise<string> {
 
 export function setLocalEndpoint(
   configFile: string,
-  localEndpoint: string
+  localEndpoint: string,
 ): string {
   return configFile
     .split("\n")
     .map((row) =>
-      row.startsWith("Endpoint =") ? `Endpoint = ${localEndpoint}` : row
+      row.startsWith("Endpoint =") ? `Endpoint = ${localEndpoint}` : row,
     )
     .join("\n");
 }
diff --git a/api/src/executables/getWireguardCredentials.ts b/api/src/executables/getWireguardCredentials.ts
index eb5cd472..31b8229c 100644
--- a/api/src/executables/getWireguardCredentials.ts
+++ b/api/src/executables/getWireguardCredentials.ts
@@ -11,6 +11,7 @@ import {
   createLocalConfigFile,
   getRemoteConfigFilePath,
 } from "../createLocalConfigFile";
+import { setLocalhostConfig } from "../setLocalhostConfig";
 import fs from "fs";
 
 (async function (): Promise<void> {
@@ -23,20 +24,25 @@ import fs from "fs";
 
     const isQr = process.argv.includes("--qr");
     const isLocal = process.argv.includes("--local");
+    const isLocalhost = process.argv.includes("--localhost");
 
     const configName = isLocal ? "local" : "remote";
     const configFormat = isQr ? "qr" : "text";
     console.log(
-      `Preparing ${configName} ${configFormat} Wireguard credentials; use CTRL + C to stop`
+      `Preparing ${configName} ${configFormat} Wireguard credentials; use CTRL + C to stop`,
     );
 
-    const config = isLocal
+    const baseConfig = isLocal
       ? await createLocalConfigFile(params.MASTER_ADMIN)
       : fs.readFileSync(
           getRemoteConfigFilePath(params.MASTER_ADMIN, "conf"),
-          "utf-8"
+          "utf-8",
         );
 
+    // Mostly required to connect from within the same machine,
+    // especially when DAppNode is installed on macOS.
+    const config = isLocalhost ? setLocalhostConfig(baseConfig) : baseConfig;
+
     const str = isQr
       ? // If rendering the QR fails, show error and the raw remoteTextCreds
         await renderQrCode(config).catch((e) => {
diff --git a/api/src/setLocalhostConfig.ts b/api/src/setLocalhostConfig.ts
new file mode 100644
index 00000000..b703cca8
--- /dev/null
+++ b/api/src/setLocalhostConfig.ts
@@ -0,0 +1,8 @@
+export function setLocalhostConfig(configFile: string): string {
+  return configFile
+    .split("\n")
+    .map((row) =>
+      row.match(/^Endpoint\s*=/) ? "Endpoint = localhost:51820" : row,
+    )
+    .join("\n");
+}
diff --git a/api/test/createLocalConfigFile.test.ts b/api/test/createLocalConfigFile.test.ts
index 82ca376e..fc7da7ce 100644
--- a/api/test/createLocalConfigFile.test.ts
+++ b/api/test/createLocalConfigFile.test.ts
@@ -28,6 +28,8 @@ AllowedIPs = 0.0.0.0/0`;
 
     const localEndpoint = `192.168.1.45:51820`;
 
-    expect(setLocalEndpoint(remoteConfig, localEndpoint)).to.deep.equal(expextedLocalConfig);
+    expect(setLocalEndpoint(remoteConfig, localEndpoint)).to.deep.equal(
+      expextedLocalConfig,
+    );
   });
 });
diff --git a/api/test/setLocalhostConfig.test.ts b/api/test/setLocalhostConfig.test.ts
new file mode 100644
index 00000000..8087ff17
--- /dev/null
+++ b/api/test/setLocalhostConfig.test.ts
@@ -0,0 +1,43 @@
+import "mocha";
+import { expect } from "chai";
+import { setLocalhostConfig } from "../src/setLocalhostConfig";
+
+describe("setLocalhostConfig", function () {
+  it("sets localhost endpoint", function () {
+    const remoteConfig = `[Interface]
+Address = AX032NVGI2RIB4
+PrivateKey = HIgo9xNzJMWLKASShiTqIybxZ0U3wGLiUeJ1PKf8ykw=
+DNS = 172.33.1.2
+
+[Peer]
+PublicKey = gI6EdUSYvn8ugXOt8QQD6Yc+JyiZxIhp3GInSWRfWGE=
+Endpoint = ff0239facf453517.dyndns.dappnode.io:51820
+AllowedIPs = 0.0.0.0/0`;
+
+    const expectedLocalhostConfig = `[Interface]
+Address = AX032NVGI2RIB4
+PrivateKey = HIgo9xNzJMWLKASShiTqIybxZ0U3wGLiUeJ1PKf8ykw=
+DNS = 172.33.1.2
+
+[Peer]
+PublicKey = gI6EdUSYvn8ugXOt8QQD6Yc+JyiZxIhp3GInSWRfWGE=
+Endpoint = localhost:51820
+AllowedIPs = 0.0.0.0/0`;
+
+    expect(setLocalhostConfig(remoteConfig)).to.deep.equal(
+      expectedLocalhostConfig,
+    );
+  });
+
+  it("replaces endpoint when spacing around equal sign varies", function () {
+    const remoteConfig = `[Peer]
+Endpoint    = ff0239facf453517.dyndns.dappnode.io:51820`;
+
+    const expectedLocalhostConfig = `[Peer]
+Endpoint = localhost:51820`;
+
+    expect(setLocalhostConfig(remoteConfig)).to.deep.equal(
+      expectedLocalhostConfig,
+    );
+  });
+});
diff --git a/root/defaults/peer.conf b/root/defaults/peer.conf
index d987dba9..525b2bd8 100644
--- a/root/defaults/peer.conf
+++ b/root/defaults/peer.conf
@@ -1,7 +1,6 @@
 [Interface]
 Address = ${CLIENT_IP}
 PrivateKey = $(cat /config/${PEER_ID}/privatekey-${PEER_ID})
-ListenPort = 51820
 DNS = ${PEERDNS}
 
 [Peer]