diff --git a/src/datalayer/syncService.js b/src/datalayer/syncService.js
index 30a8fa47..577928b1 100644
--- a/src/datalayer/syncService.js
+++ b/src/datalayer/syncService.js
@@ -174,11 +174,11 @@ const getSubscribedStoreData = async (
   alreadySubscribed = false,
   retry = 0,
 ) => {
-  if (retry >= 20) {
+  if (retry >= 60) {
     throw new Error('Max retrys exceeded, Can not subscribe to organization');
   }
 
-  const timeoutInterval = 60000;
+  const timeoutInterval = 30000;
 
   if (!alreadySubscribed) {
     const response = await subscribeToStoreOnDataLayer(storeId, ip, port);
diff --git a/src/datalayer/writeService.js b/src/datalayer/writeService.js
index 3bc4e71e..de13109f 100644
--- a/src/datalayer/writeService.js
+++ b/src/datalayer/writeService.js
@@ -35,7 +35,7 @@ const syncDataLayer = async (storeId, data, failedCallback) => {
 
 const retry = (storeId, changeList, failedCallback, retryAttempts) => {
   log('RETRYING...', retryAttempts);
-  if (retryAttempts >= 10) {
+  if (retryAttempts >= 60) {
     log('Could not push changelist to datalayer after retrying 10 times');
     failedCallback();
     return;