diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 80ef8b509..a45d5d833 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -2028,7 +2028,6 @@ define([
         });
     };
 
-    var launchedWithNoDrive = false;
     var provideFeedback = function () {
         if (typeof(window.Proxy) === 'undefined') {
             Feedback.send("NO_PROXIES");
@@ -2065,10 +2064,6 @@ define([
         if (!common.hasCSSVariables()) {
             Feedback.send('NO_CSS_VARIABLES');
         }
-        if (launchedWithNoDrive) {
-            Feedback.send('NO_DRIVE');
-        }
-
         Feedback.reportScreenDimensions();
         Feedback.reportLanguage();
     };
@@ -2297,10 +2292,6 @@ define([
             };
             common.userHash = userHash;
 
-            if (rdyCfg.noDrive) {
-                launchedWithNoDrive = true;
-            }
-
             // FIXME Backward compatibility
             if (sessionStorage.newPadFileData) {
                 common.fromFileData = JSON.parse(sessionStorage.newPadFileData);
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index af5ac9047..eb20875bc 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -3068,14 +3068,19 @@ define([
                         if (obj.error === 'GET_HK') {
                             data.noDrive = false;
                             Store.init(clientId, data, _callback);
+                            Feedback.send("NO_DRIVE_ERROR", true);
                             return;
                         }
                     }
+                    Feedback.send("NO_DRIVE", true);
                     callback(obj);
                 });
             }
 
             initialized = true;
+            if (store.noDriveUid) {
+                Feedback.send('NO_DRIVE_CONVERSION', true);
+            }
 
             store.data = data;
             connect(clientId, data, function (ret) {