diff --git a/src/common/helper.js b/src/common/helper.js
index e35c661e..506a60f7 100644
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -952,6 +952,7 @@ async function postEvent (topic, payload, options = {}) {
     'mime-type': 'application/json',
     payload
   }
+  _.merge(message,options)
   await client.postEvent(message)
   await eventDispatcher.handleEvent(topic, { value: payload, options })
 }
diff --git a/src/services/WorkPeriodService.js b/src/services/WorkPeriodService.js
index fc750bd7..cd149a36 100644
--- a/src/services/WorkPeriodService.js
+++ b/src/services/WorkPeriodService.js
@@ -235,7 +235,7 @@ async function createWorkPeriod (currentUser, workPeriod) {
     }
   }
 
-  await helper.postEvent(config.TAAS_WORK_PERIOD_CREATE_TOPIC, created.toJSON())
+  await helper.postEvent(config.TAAS_WORK_PERIOD_CREATE_TOPIC, created.toJSON(),{"key":workPeriod.resourceBookingId})
   return created.dataValues
 }
 
@@ -289,7 +289,8 @@ async function updateWorkPeriod (currentUser, id, data) {
     }
   }
 
-  await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue })
+  //await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue })
+  await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), {"key":data.resourceBookingId})
   return updated.dataValues
 }