diff --git a/TaskManager/server.js b/TaskManager/server.js
index d426bd320..746f895ad 100644
--- a/TaskManager/server.js
+++ b/TaskManager/server.js
@@ -72,7 +72,7 @@ function runTask(message) {
         id: message.event.taskId,
         name: message.event.taskName
     }
-    
+
     tasks.set(message.event.taskId, task) 
 
     task.childProcess.on('error', (err) => {
@@ -86,7 +86,7 @@ function runTask(message) {
         tasks.delete(task.id)
     })
 
-    setTimeout(sendStartingEvent, 3000)
+    global.SYSTEM_EVENT_HANDLER.listenToEvent('Task Manager - ' + message.event.taskId, 'Nodejs Process Ready for Task', undefined, undefined, undefined, sendStartingEvent)
 
     function sendStartingEvent() {
         //console.log('[INFO] Task Manager -> server -> runTask -> Emitting Event -> key = ' + 'Task Server - ' + task.id)
diff --git a/TaskServer/server.js b/TaskServer/server.js
index f299cafcc..566a26f89 100644
--- a/TaskServer/server.js
+++ b/TaskServer/server.js
@@ -27,8 +27,6 @@ global.CUSTOM_FAIL_RESPONSE = {
 
 const ONE_DAY_IN_MILISECONDS = 24 * 60 * 60 * 1000;
 
-/* Process Events */
-
 process.on('uncaughtException', function (err) {
     console.log('[ERROR] Task Server -> server -> uncaughtException -> err.message = ' + err.message)
     console.log('[ERROR] Task Server -> server -> uncaughtException -> err.stack = ' + err.stack)
@@ -122,6 +120,7 @@ function preLoader() {
         try {
             //console.log('[INFO] Task Server -> server -> preLoader -> Listening to starting event -> key = ' + 'Task Server - ' + taskId)
             global.SYSTEM_EVENT_HANDLER.listenToEvent('Task Server - ' + taskId, 'Run Task', undefined, undefined, undefined, eventReceived)
+            global.SYSTEM_EVENT_HANDLER.raiseEvent('Task Manager - ' + taskId, 'Nodejs Process Ready for Task')
             function eventReceived(message) {
                 global.TASK_NODE = message
                 global.TASK_NODE = JSON.parse(message.event.definition)