diff --git a/packages/doorman-api/functions/common/discord.private.js b/packages/doorman-api/functions/common/discord.private.js
index 448b9ee..dccdddf 100644
--- a/packages/doorman-api/functions/common/discord.private.js
+++ b/packages/doorman-api/functions/common/discord.private.js
@@ -11,7 +11,7 @@ exports.getDiscordClient = async (context) => {
     const client = new Client({
       intents: [GatewayIntentBits.DirectMessages],
       rest: {
-        timeout: 60_000, // 1 minute
+        timeout: 8_000, // 8s
       }
     });
 
diff --git a/packages/doorman-client/functions/buzzer-activated.js b/packages/doorman-client/functions/buzzer-activated.js
index 6141ddf..f80cfaf 100644
--- a/packages/doorman-client/functions/buzzer-activated.js
+++ b/packages/doorman-client/functions/buzzer-activated.js
@@ -142,7 +142,7 @@ exports.handler = async function(context, event, callback) {
 
   const twiml = await Promise.race([unlockPromise, gracefulFallbackPromise, ungracefulFallbackPromise]);
   console.log(invokeId, "Race ended, clearing residual timers");
-  // timeouts.forEach(timeout => clearTimeout(timeout));
-  // intervals.forEach(interval => clearInterval(interval));
+  timeouts.forEach(timeout => clearTimeout(timeout));
+  intervals.forEach(interval => clearInterval(interval));
   callback(null, twiml);
 };