diff --git a/src/lib/Server.js b/src/lib/Server.js
index c893d7d..f8f380b 100644
--- a/src/lib/Server.js
+++ b/src/lib/Server.js
@@ -104,7 +104,7 @@ module.exports = class Server {
           .replace(/(-{2,}|-$)/g, '-')
           .replace(/-$/, '')
           .substring(0, 32);
-        res.header('Content-Disposition', `attachment; filename="${configName}.conf"`);
+        res.header('Content-Disposition', `attachment; filename="${configName || clientId}.conf"`);
         res.header('Content-Type', 'text/plain');
         res.send(config);
       }))