diff --git a/libloki/modules/local_loki_server.js b/libloki/modules/local_loki_server.js
index 9be424f4f..6d0b39476 100644
--- a/libloki/modules/local_loki_server.js
+++ b/libloki/modules/local_loki_server.js
@@ -16,17 +16,12 @@ class LocalLokiServer extends EventEmitter {
    * Creates an instance of LocalLokiServer.
    * Sends out a `message` event when a new message is received.
    */
-  constructor(pems, options) {
+  constructor(pems, options = {}) {
     super();
     const httpsOptions = {
       key: pems.private,
       cert: pems.cert,
     };
-    // eslint-disable-next-line no-param-reassign
-    options = {
-      skipUpnp: false,
-      ...options,
-    };
     if (!options.skipUpnp) {
       this.upnpClient = natUpnp.createClient();
     }
@@ -101,8 +96,9 @@ class LocalLokiServer extends EventEmitter {
             const publicPort = await this.punchHole();
             res(publicPort);
           } catch (e) {
-            if (e instanceof textsecure.HolePunchingError)
+            if (e instanceof textsecure.HolePunchingError) {
               await this.close();
+            }
             rej(e);
           }
         } else {