diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2c8a5e..5d00926 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.0] - 2020-10-12
+- Added real-time notifications new listeners and agents [#49](https://github.com/BC-SECURITY/Starkiller/pull/49) 
+- Log out the user when a connection can't be established to the Empire server
+
 ## [1.3.2] - 2020-07-29
 - "Listener" option on modules now shows up as a dropdown instead of a textfield
 - Correct some of the "cannot read property data of undefined" errors
diff --git a/README.md b/README.md
index ce31e25..39640f7 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ Starkiller’s new features occasionally depend on new functionality within Empi
 | 1.1.x              | 3.1.5         | 3.1.5 updated the reporting endpoint to have the same result as running it in the CLI. Starkiller 1.1.x uses that reporting endpoint for the reporting tab |
 | 1.2.x              | 3.2.0         | 3.2.0 added an endpoint for users that is needed for the UI updates introduced in Starkiller 1.2.0
 | 1.3.x              | 3.3.0         | 3.3.0 categorized all of the modules in Empire with corresponding [MITRE techniques](https://attack.mitre.org/techniques/enterprise/)
+| 1.4.x              | 3.5.0         | 3.5.0 added real-time notifications for new listeners and agents
 
 ## Changelog
 
diff --git a/package.json b/package.json
index e0ad1e2..946c803 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "starkiller",
-  "version": "1.4.0-RC1",
+  "version": "1.4.0-RC2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/src/App.vue b/src/App.vue
index c1ce5d1..137e8c8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,7 @@
     <v-app :dark="isDarkMode">
       <side-nav v-if="isLoggedIn" />
       <confirm ref="confirm" />
-      <socket-notifications />
+      <socket-notifications v-if="isLoggedIn && versionSatisfies('>=3.5.0')" />
 
       <!-- Sizes your content based upon application components -->
       <v-main>
@@ -82,9 +82,9 @@ export default {
     empireVersion: {
       handler(val) {
         if (val.length > 0) {
-          if (!semver.satisfies(val.split(' ')[0], '>=3.3.0')) {
+          if (!semver.satisfies(val.split(' ')[0], '>=3.5.0')) {
             this.$toast.error(
-              'Starkiller 1.3.x is recommended to be used with Empire 3.3.0 or greater.'
+              'Starkiller 1.4.x is recommended to be used with Empire 3.5.0 or greater.'
               + ' Some features may not work properly.',
               { timeout: 8000 },
             );
@@ -102,6 +102,11 @@ export default {
       this.$router.push({ name: 'listeners' });
     }
   },
+  methods: {
+    versionSatisfies(version) {
+      return semver.satisfies(this.empireVersion.split(' ')[0], version);
+    },
+  },
 };
 </script>
 <style lang="scss">
diff --git a/src/api/axios-instance.js b/src/api/axios-instance.js
index a93f5bc..ea88d6e 100644
--- a/src/api/axios-instance.js
+++ b/src/api/axios-instance.js
@@ -21,6 +21,10 @@ export function setInstance(url, token) {
   axiosInstance.interceptors.response.use(
     response => response,
     (err) => {
+      if (!err.response) {
+        // check your connection
+        store.dispatch('application/logout');
+      }
       if (err.response.status === 401) {
         store.dispatch('application/logout');
       }
diff --git a/src/components/SocketNotifications.vue b/src/components/SocketNotifications.vue
index 7e7977a..164d767 100644
--- a/src/components/SocketNotifications.vue
+++ b/src/components/SocketNotifications.vue
@@ -50,14 +50,15 @@ export default {
     },
   },
   watch: {
-    socketUrl(val) {
+    isLoggedIn(val) {
+      if (val === true && !this.socket) {
+        this.connect();
+        this.setHandlers();
+      }
+    },
+    socketUrl() {
       if (this.isLoggedIn && !this.socket) {
-        this.socket = io(`${val}?token=${this.apiToken}`, {
-          reconnection: true,
-          reconnectionAttempts: 10,
-          reconnectionDelay: 1000,
-          reconnectionDelayMax: 10000,
-        });
+        this.connect();
         this.setHandlers();
       } else {
         console.log('Closing Socket');
@@ -68,16 +69,19 @@ export default {
   },
   mounted() {
     if (!this.socket && this.socketUrl && this.isLoggedIn) {
+      this.connect();
+      this.setHandlers();
+    }
+  },
+  methods: {
+    connect() {
       this.socket = io(`${this.socketUrl}?token=${this.apiToken}`, {
         reconnection: true,
         reconnectionAttempts: 10,
         reconnectionDelay: 1000,
         reconnectionDelayMax: 10000,
       });
-      this.setHandlers();
-    }
-  },
-  methods: {
+    },
     setHandlers() {
       this.socket.on('listeners/new', (data) => {
         this.socketNotification = {