diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js
index 1d432a30..372524c5 100644
--- a/src/lib/WireGuard.js
+++ b/src/lib/WireGuard.js
@@ -141,7 +141,7 @@ AllowedIPs = ${client.address}/32`;
       createdAt: new Date(client.createdAt),
       updatedAt: new Date(client.updatedAt),
       allowedIPs: client.allowedIPs,
-
+      downloadableConfig: 'privateKey' in client,
       persistentKeepalive: null,
       latestHandshakeAt: null,
       transferRx: null,
@@ -198,7 +198,7 @@ AllowedIPs = ${client.address}/32`;
 
     return `
 [Interface]
-PrivateKey = ${client.privateKey}
+PrivateKey = ${client.privateKey ? `${client.privateKey}` : 'REPLACE_ME'}
 Address = ${client.address}/24
 ${WG_DEFAULT_DNS ? `DNS = ${WG_DEFAULT_DNS}` : ''}
 ${WG_MTU ? `MTU = ${WG_MTU}` : ''}
diff --git a/src/www/css/app.css b/src/www/css/app.css
index 4f4e21dd..3232d333 100644
--- a/src/www/css/app.css
+++ b/src/www/css/app.css
@@ -1334,6 +1334,11 @@ video {
   transition-duration: 150ms;
 }
 
+.disabled-link {
+  opacity: 0.25;
+  cursor: default;
+}
+
 .duration-200 {
   transition-duration: 200ms;
 }
diff --git a/src/www/index.html b/src/www/index.html
index 2edf3c70..fa5534d5 100644
--- a/src/www/index.html
+++ b/src/www/index.html
@@ -214,9 +214,14 @@
 
                     <!-- Show QR-->
 
-                    <button
-                      class="align-middle bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 hover:bg-red-800 dark:hover:bg-red-800 hover:text-white dark:hover:text-white p-2 rounded transition"
-                      :title="$t('showQR')" @click="qrcode = `./api/wireguard/client/${client.id}/qrcode.svg`">
+                    <button :disabled="!client.downloadableConfig"
+                      class="align-middle bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 p-2 rounded transition"
+                      :class="{
+                        'hover:bg-red-800 dark:hover:bg-red-800 hover:text-white dark:hover:text-white': client.downloadableConfig,
+                        'opacity-25': !client.downloadableConfig
+                      }"
+                      :title="!client.downloadableConfig ? $t('noPrivKey') : $t('showQR')"
+                      @click="qrcode = `./api/wireguard/client/${client.id}/qrcode.svg`">
                       <svg class="w-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                         stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
@@ -225,9 +230,16 @@
                     </button>
 
                     <!-- Download Config -->
-                    <a :href="'./api/wireguard/client/' + client.id + '/configuration'" download
-                      class="align-middle inline-block bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 hover:bg-red-800 dark:hover:bg-red-800 hover:text-white dark:hover:text-white p-2 rounded transition"
-                      :title="$t('downloadConfig')">
+                    <a :disabled="!client.downloadableConfig"
+                      :href="'./api/wireguard/client/' + client.id + '/configuration'"
+                      :download="client.downloadableConfig ? 'configuration' : null"
+                      class="align-middle inline-block bg-gray-100 dark:bg-neutral-600 dark:text-neutral-300 p-2 rounded transition"
+                      :class="{
+                        'hover:bg-red-800 dark:hover:bg-red-800 hover:text-white dark:hover:text-white': client.downloadableConfig,
+                        'disabled-link': !client.downloadableConfig
+                      }"
+                      :title="!client.downloadableConfig ? $t('noPrivKey') : $t('downloadConfig')"
+                      @click="if(!client.downloadableConfig) { $event.preventDefault(); }">
                       <svg class="w-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                         stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
diff --git a/src/www/js/i18n.js b/src/www/js/i18n.js
index 1a2bafb2..24f8abda 100644
--- a/src/www/js/i18n.js
+++ b/src/www/js/i18n.js
@@ -23,6 +23,7 @@ const messages = { // eslint-disable-line no-unused-vars
     disableClient: 'Disable Client',
     enableClient: 'Enable Client',
     noClients: 'There are no clients yet.',
+    noPrivKey: 'This client has no known private key. Cannot create Configuration.',
     showQR: 'Show QR Code',
     downloadConfig: 'Download Configuration',
     madeBy: 'Made by',
@@ -186,6 +187,7 @@ const messages = { // eslint-disable-line no-unused-vars
     disableClient: 'Client deaktivieren',
     enableClient: 'Client aktivieren',
     noClients: 'Es wurden noch keine Clients konfiguriert.',
+    noPrivKey: 'Es ist kein Private Key für diesen Client bekannt. Eine Konfiguration kann nicht erstellt werden.',
     showQR: 'Zeige den QR Code',
     downloadConfig: 'Konfiguration herunterladen',
     madeBy: 'Erstellt von',