diff --git a/couchpotato/api.py b/couchpotato/api.py
index a0fd69b..15ef2b4 100644
--- a/couchpotato/api.py
+++ b/couchpotato/api.py
@@ -15,19 +15,24 @@ class NonBlockHandler(RequestHandler):
 
     @asynchronous
     def get(self, route):
+        cls = NonBlockHandler
         start, stop = api_nonblock[route]
-        self.stoppers.append(stop)
+        cls.stoppers.append(stop)
 
-        start(self.on_new_messages, last_id = self.get_argument("last_id", None))
+        start(self.onNewMessage, last_id = self.get_argument("last_id", None))
 
-    def on_new_messages(self, response):
+    def onNewMessage(self, response):
         if self.request.connection.stream.closed():
             return
         self.finish(response)
 
     def on_connection_close(self):
-        for stop in self.stoppers:
-            stop(self.on_new_messages)
+        cls = NonBlockHandler
+
+        for stop in cls.stoppers:
+            stop(self.onNewMessage)
+
+        cls.stoppers = []
 
 
 def addApiView(route, func, static = False, docs = None, **kwargs):
diff --git a/couchpotato/core/notifications/core/main.py b/couchpotato/core/notifications/core/main.py
index 162e865..d978948 100644
--- a/couchpotato/core/notifications/core/main.py
+++ b/couchpotato/core/notifications/core/main.py
@@ -17,7 +17,7 @@ log = CPLog(__name__)
 
 class CoreNotifier(Notification):
 
-    m_lock = threading.RLock()
+    m_lock = threading.Lock()
     messages = []
     listeners = []
 
@@ -124,14 +124,14 @@ class CoreNotifier(Notification):
 
         self.m_lock.acquire()
         message = {
-            'id': str(uuid.uuid4()),
+            'message_id': str(uuid.uuid4()),
             'time': time.time(),
             'type': type,
             'data': data,
         }
         self.messages.append(message)
 
-        while True and not self.shuttingDown():
+        while len(self.listeners) > 0 and not self.shuttingDown():
             try:
                 listener, last_id = self.listeners.pop()
                 listener({
@@ -142,7 +142,6 @@ class CoreNotifier(Notification):
                 break
 
         self.m_lock.release()
-
         self.cleanMessages()
 
     def addListener(self, callback, last_id = None):
@@ -157,8 +156,9 @@ class CoreNotifier(Notification):
 
         self.listeners.append((callback, last_id))
 
+
     def removeListener(self, callback):
-        self.m_lock.acquire()
+
         for list_tuple in self.listeners:
             try:
                 listener, last_id = list_tuple
@@ -166,26 +166,28 @@ class CoreNotifier(Notification):
                     self.listeners.remove(list_tuple)
             except:
                 pass
-        self.m_lock.release()
 
     def cleanMessages(self):
-
         self.m_lock.acquire()
+
         for message in self.messages:
             if message['time'] < (time.time() - 15):
                 self.messages.remove(message)
+
         self.m_lock.release()
 
     def getMessages(self, last_id):
         self.m_lock.acquire()
+
         recent = []
         index = 0
         for i in xrange(len(self.messages)):
             index = len(self.messages) - i - 1
-            if self.messages[index]["id"] == last_id: break
+            if self.messages[index]["message_id"] == last_id: break
             recent = self.messages[index + 1:]
 
         self.m_lock.release()
+
         return recent or []
 
     def listener(self):
diff --git a/couchpotato/core/notifications/core/static/notification.js b/couchpotato/core/notifications/core/static/notification.js
index 350c65f..4cf71e0 100644
--- a/couchpotato/core/notifications/core/static/notification.js
+++ b/couchpotato/core/notifications/core/static/notification.js
@@ -9,6 +9,7 @@ var NotificationBase = new Class({
 
 		// Listener
 		App.addEvent('unload', self.stopPoll.bind(self));
+		App.addEvent('reload', self.startInterval.bind(self, [true]));
 		App.addEvent('notification', self.notify.bind(self));
 
 		// Add test buttons to settings page
@@ -86,10 +87,13 @@ var NotificationBase = new Class({
 
 	},
 
-	startInterval: function(){
+	startInterval: function(force){
 		var self = this;
 		
-		if(self.stopped) return;
+		if(self.stopped && !force){
+			self.stopped = false;
+			return;
+		}
 
 		Api.request('notification.listener', {
     		'data': {'init':true},
@@ -132,7 +136,7 @@ var NotificationBase = new Class({
 				App.fireEvent(result.type, result)
 			})
 
-			self.last_id = json.result.getLast().id
+			self.last_id = json.result.getLast().message_id
 		}
 
 		// Restart poll