diff --git a/src/components/Topic.vue b/src/components/Topic.vue
index d82080a..bc70845 100644
--- a/src/components/Topic.vue
+++ b/src/components/Topic.vue
@@ -15,7 +15,7 @@
         </div>
 
         <div class="contact-right">
-          <div v-if="topic.online === true" class="contact-presence">
+          <div v-if="topicOnline" class="contact-presence">
               <span>&#183;</span>
           </div>
 
@@ -47,20 +47,13 @@ export default {
       return this.topic.touched;
     },
     topicOnline() {
-      return this.topic.online;
+      return store.state.client.tinodeClient.getTopic(this.topic.topic).online;
     }
   }
 };
 </script>
 
 <style lang="scss">
-// p {
-//   -webkit-user-select: text;
-//   -khtml-user-select: text;
-//   -moz-user-select: text;
-//   -o-user-select: text;
-//   user-select: text;
-// }
 .contact {
   display: flex;
   justify-content: center;
diff --git a/src/store/modules/client.js b/src/store/modules/client.js
index 063ff9a..e34204d 100644
--- a/src/store/modules/client.js
+++ b/src/store/modules/client.js
@@ -84,36 +84,10 @@ export default {
 
           me.onPres = function(pres) {
             console.log("Received Presence msg:", pres);
-            let contact = store.getters.contacts.find(c => {
-              return c.topic == pres.src;
+            store.dispatch("updateTopicPresence", {
+              topicID: pres.src,
+              presence: pres.what == "on" ? true : false
             });
-            if (contact) {
-              if (pres.topic == "me") {
-                switch (pres.what) {
-                  case "on":
-                    store.dispatch("updateTopicPresence", {
-                      topicID: pres.src,
-                      presence: true
-                    });
-
-                    break;
-                  case "off":
-                    store.dispatch("updateTopicPresence", {
-                      topicID: pres.src,
-                      presence: false
-                    });
-                    break;
-
-                  case "msg":
-                    // presence message for a notification
-                    break;
-                }
-              }
-            } else {
-              console.log(
-                "Received a presence message from someone whom client is not subbed to"
-              );
-            }
           };
 
           fnd.onMeta = function(meta) {
diff --git a/src/store/modules/contacts.js b/src/store/modules/contacts.js
index 437b869..9144ee8 100644
--- a/src/store/modules/contacts.js
+++ b/src/store/modules/contacts.js
@@ -3,11 +3,13 @@ import axios from "axios";
 
 export function defaultState() {
   return {
-    contacts: [],
+    contacts: [{}],
     selectedTopicID: "",
+
+    // Add contact form drop down menu in ContactsListView.vue
     addContactForm: {
       searchQuery: "",
-      searchResults: [],
+      searchResults: [{}],
       isVisible: false
     }
   };
@@ -95,13 +97,8 @@ export default {
         payload.topicID,
         payload.presence
       );
-
-      let contact = state.contacts.find(c => {
-        return c.topic == payload.topicID;
-      });
-      if (contact) {
-        contact.online = payload.presence;
-      }
+      let topic = store.state.client.tinodeClient.getTopic(payload.topicID);
+      topic.online = payload.presence;
     },
     selectTopic(state, topicID) {
       console.log("Selecting topic", topicID);