diff --git a/gateway/server.go b/gateway/server.go
index 4834672c..e879d771 100644
--- a/gateway/server.go
+++ b/gateway/server.go
@@ -93,7 +93,7 @@ func main() {
 			log.Fatalln(queueErr)
 		}
 
-		faasHandlers.QueuedProxy = handlers.MakeQueuedProxy(metricsOptions, true, natsQueue)
+		faasHandlers.QueuedProxy = handlers.MakeCallIDMiddleware(handlers.MakeQueuedProxy(metricsOptions, true, natsQueue))
 		faasHandlers.AsyncReport = handlers.MakeAsyncReport(metricsOptions)
 	}