diff --git a/Files-Component/src/FileCursor.js b/Files-Component/src/FileCursor.js
index d1bede545..88c1463e1 100644
--- a/Files-Component/src/FileCursor.js
+++ b/Files-Component/src/FileCursor.js
@@ -90,10 +90,12 @@ function newFileCursor () {
       endDateRange = pEndDateRange
 
       let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset
-      eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponseDataSet, updateFiles)
+      let callerId = key + '-' + periodName + newUniqueId()
+      eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponseDataSet, updateFiles)
 
       key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset
-      eventsServerClient.listenToEvent(key, 'Data Range Updated', undefined, key, onResponseDataRange, updateDataRange)
+      callerId = key + '-' + periodName + newUniqueId()
+      eventsServerClient.listenToEvent(key, 'Data Range Updated', undefined, callerId, onResponseDataRange, updateDataRange)
 
       callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE)
 
diff --git a/Files-Component/src/MarketFiles.js b/Files-Component/src/MarketFiles.js
index 734314cfd..ec1a45ee2 100644
--- a/Files-Component/src/MarketFiles.js
+++ b/Files-Component/src/MarketFiles.js
@@ -109,7 +109,8 @@ function newMarketFiles () {
 
               if (filesLoaded + filesNotLoaded === marketFilesPeriods.length) {
                 let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset
-                eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponse, updateFiles)
+                let callerId = key + '-' + periodName + newUniqueId()
+                eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponse, updateFiles)
 
                 callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject)