diff --git a/hal-core/src/se/hal/EventControllerManager.java b/hal-core/src/se/hal/EventControllerManager.java
index 03afee3a..c76fd297 100644
--- a/hal-core/src/se/hal/EventControllerManager.java
+++ b/hal-core/src/se/hal/EventControllerManager.java
@@ -180,7 +180,7 @@ public class EventControllerManager extends HalAbstractControllerManager<HalEven
         HalEventController controller = getControllerInstance(controllerClass);
 
         if (controller != null) {
-            event.getDeviceData().setTimestamp(System.currentTimeMillis()); // Set timestamp to now
+            eventData.setTimestamp(System.currentTimeMillis()); // Set timestamp to now
             controller.send(event.getDeviceConfig(), eventData);
             reportReceived(event.getDeviceConfig(), eventData); // save action to db
         }