diff --git a/app/ui-master/client/main.js b/app/ui-master/client/main.js
index 7441bf5046b3..a3291486ade9 100644
--- a/app/ui-master/client/main.js
+++ b/app/ui-master/client/main.js
@@ -177,8 +177,9 @@ Template.main.helpers({
 
 		const settingsReady = settings.cachedCollection.ready.get();
 
+		const serviceWorkerReady = !!navigator.serviceWorker.controller;
 
-		const ready = (userReady && subscriptionsReady && settingsReady) || !Meteor.userId();
+		const ready = (userReady && subscriptionsReady && settingsReady &&  serviceWorkerReady) || !Meteor.userId();
 
 		CachedCollectionManager.syncEnabled = ready;
 		mainReady.set(ready);
diff --git a/client/startup/offlineMessages.js b/client/startup/offlineMessages.js
index 9cb836669eed..58a74a9c9465 100644
--- a/client/startup/offlineMessages.js
+++ b/client/startup/offlineMessages.js
@@ -76,7 +76,7 @@ function trigger(msg) {
 
 Meteor.startup(() => {
 	if ('indexedDB' in window) {
-		const db = indexedDB.open('persistent-minimongo2-Message');
+		const db = indexedDB.open('localforage');
 		let dbExist = true;
 
 		db.onupgradeneeded = function() {
@@ -87,9 +87,9 @@ Meteor.startup(() => {
 
 		db.onsuccess = function(event) {
 			if (!dbExist) { return; }
-			const tx = event.target.result.transaction('minimongo', 'readwrite');
-			const store = tx.objectStore('minimongo');
-			store.openCursor().onsuccess = function(event) {
+			const tx = event.target.result.transaction('keyvaluepairs', 'readwrite');
+			const store = tx.objectStore('keyvaluepairs');
+			store.openCursor("chatMessage").onsuccess = function(event) {
 				const cursor = event.target.result;
 				if (cursor) {
 					if (cursor.value.temp) {