diff --git a/ui/desktop/electron-app/src/helpers/app-updater.js b/ui/desktop/electron-app/src/helpers/app-updater.js
index bb19d756c..280bfba3b 100644
--- a/ui/desktop/electron-app/src/helpers/app-updater.js
+++ b/ui/desktop/electron-app/src/helpers/app-updater.js
@@ -107,17 +107,25 @@ const displayInfoPrompt = () => {
 /**
  * Show update available prompt
  */
-const displayDownloadPrompt = (version, url) => {
+const displayDownloadPrompt = (latestVersion, url) => {
+  let detail = 'A new version is available for download.';
+
   const dialogOpts = {
     type: 'info',
     buttons: ['Download', 'Later'],
     icon: null,
-    detail: 'A new version is available for download',
+    detail,
   };
 
+  // If the user's current version is less than 2.0.0, show a warning that upgrading might not be compatible
+  if (semver.lt(currentVersion, '2.0.0')) {
+    dialogOpts.detail += `\n\nThis is a major version upgrade which could be incompatible with your current controller version.`;
+    dialogOpts.type = 'warning';
+  }
+
   dialog.showMessageBox(dialogOpts).then((returnValue) => {
     if (returnValue.response === 0) {
-      downloadAndInstallUpdate(version, url);
+      downloadAndInstallUpdate(latestVersion, url);
     }
   });
 };
diff --git a/ui/desktop/electron-app/src/index.js b/ui/desktop/electron-app/src/index.js
index 07370978b..90898a09f 100644
--- a/ui/desktop/electron-app/src/index.js
+++ b/ui/desktop/electron-app/src/index.js
@@ -260,8 +260,6 @@ app.on('before-quit', (event) => {
 });
 
 app.on('quit', () => {
-  // TODO: Should we check if the desktop client started the daemon?
-  //  If not, we probably shouldn't stop the daemon
   clientDaemonManager.stop();
 });