diff --git a/lib/loop.js b/lib/loop.js
index 4fb197e..a73ca5f 100644
--- a/lib/loop.js
+++ b/lib/loop.js
@@ -11,7 +11,7 @@ var Event        = require('../app/models/jobs/event')
 // find the valid tokens associated to property-udpated events
 exports.execute = function(io) {
   Event.db.db.executeDbCommand({"convertToCapped": "events", size: 10000000, max:1000})
-  Event.find({ websocket_processed: false, event: 'property-update' })
+  Event.find({ websocket_processed: false })
     .tailable().stream().on('data', function(collection) { findTokens(collection, io) });
 }
 
@@ -28,7 +28,10 @@ var findTokens = function(event, io) {
 
       // avoid the emitting for tokens that are not used from a web client
       if (io.sockets.manager.rooms['/' + room]) {
-        io.sockets.in(room).emit('update', { data: event.data, token: event.token });
+        io.sockets.in(room).emit(event.event, { data: event.data, token: event.token });
+        if (event.event === 'property-update') {
+          io.sockets.in(room).emit('update', { data: event.data, token: event.token });
+        }
       }
     });