diff --git a/onionr/communicator.py b/onionr/communicator.py
index 263328f4..27753022 100755
--- a/onionr/communicator.py
+++ b/onionr/communicator.py
@@ -116,7 +116,7 @@ class OnionrCommunicatorDaemon:
         else:
             logger.debug('Will not announce node.')
         cleanupTimer = OnionrCommunicatorTimers(self, self.peerCleanup, 300, requiresPeer=True)
-        forwardSecrecyTimer = OnionrCommunicatorTimers(self, self.daemonTools.cleanKeys, 15)
+        forwardSecrecyTimer = OnionrCommunicatorTimers(self, self.daemonTools.cleanKeys, 15, maxThreads=1)
 
         # set loop to execute instantly to load up peer pool (replaced old pool init wait)
         peerPoolTimer.count = (peerPoolTimer.frequency - 1)
diff --git a/onionr/onionrusers/onionrusers.py b/onionr/onionrusers/onionrusers.py
index 4429cd18..5c85e079 100755
--- a/onionr/onionrusers/onionrusers.py
+++ b/onionr/onionrusers/onionrusers.py
@@ -111,6 +111,7 @@ class OnionrUser:
         return (retData, forwardKey[0], forwardKey[1])
 
     def forwardDecrypt(self, encrypted):
+        deleteExpiredKeys(self._core)
         retData = ""
         for key in self.getGeneratedForwardKeys(False):
             try: