diff --git a/lib/AfController.js b/lib/AfController.js
index 794aaea..60c5410 100644
--- a/lib/AfController.js
+++ b/lib/AfController.js
@@ -92,11 +92,11 @@ class AfController extends EventEmitter {
                     resend = this.registerResend(cfg.dstAddr)
                     promises.push(resend.promise.then(()=>'signalResend'))
                 }
+                cfg.signalTimeout = Q.defer()
                 const result = await Q.cancelledRace(promises)
 
                 // Handle results for any of the promises that might have returned
                 if(result === 'signalResend'){
-                    cfg.signalTimeout = Q.defer()
                     await await Q.cancelledRace([Q.delay(5000), workPromise]) // Wait at-least 5 seconds after a module error
                 }
                 else if(typeof result === 'number') {