diff --git a/js/modules/loki_mixpanel.js b/js/modules/loki_mixpanel.js
index 4632a0bc9..bf9b10e23 100644
--- a/js/modules/loki_mixpanel.js
+++ b/js/modules/loki_mixpanel.js
@@ -1,4 +1,3 @@
-const EventEmitter = require('events');
 const Mixpanel = require('mixpanel');
 
 class LokiMixpanelAPI {
diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js
index aa0823723..080a3f408 100644
--- a/js/modules/loki_public_chat_api.js
+++ b/js/modules/loki_public_chat_api.js
@@ -1,5 +1,5 @@
 /* global log, textsecure, libloki, Signal, Whisper, Headers, ConversationController,
-clearTimeout, MessageController */
+clearTimeout, MessageController, window */
 const EventEmitter = require('events');
 const nodeFetch = require('node-fetch');
 const { URL, URLSearchParams } = require('url');
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index 3a3abe68f..6ef84e7d3 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -292,6 +292,9 @@
       $target.toggleClass('section-toggle-visible');
     },
     async openConversation(id, messageId) {
+      const conversationExists = await ConversationController.getConversation(
+        id
+      );
       const conversation = await ConversationController.getOrCreateAndWait(
         id,
         'private'
@@ -311,7 +314,7 @@
         if (conversation.isPrivate()) {
           if (conversation.isMe()) {
             window.mixpanel.track('Note To Self Opened');
-          } else {
+          } else if (conversationExists) {
             window.mixpanel.track('Conversation Opened');
           }
         }
diff --git a/preload.js b/preload.js
index a82482870..42475394a 100644
--- a/preload.js
+++ b/preload.js
@@ -328,7 +328,8 @@ window.LokiPublicChatAPI = require('./js/modules/loki_public_chat_api');
 
 window.LokiRssAPI = require('./js/modules/loki_rss_api');
 
-window.LokiMixpanelAPI = require('./js/modules/loki_mixpanel.js');
+const LokiMixpanelAPI = require('./js/modules/loki_mixpanel.js');
+
 window.mixpanel = new LokiMixpanelAPI();
 
 window.LocalLokiServer = require('./libloki/modules/local_loki_server');