diff --git a/apps/astarte_data_updater_plant/lib/astarte_data_updater_plant/triggers_handler.ex b/apps/astarte_data_updater_plant/lib/astarte_data_updater_plant/triggers_handler.ex
index ad6a81796e..84825ea607 100644
--- a/apps/astarte_data_updater_plant/lib/astarte_data_updater_plant/triggers_handler.ex
+++ b/apps/astarte_data_updater_plant/lib/astarte_data_updater_plant/triggers_handler.ex
@@ -126,6 +126,22 @@ defmodule Astarte.DataUpdaterPlant.TriggersHandler do
 
     event = %IncomingDataEvent{interface: interface_name, path: path, bson_value: bson_value}
 
+    Logger.info(device_id)
+
+    Logger.info(
+      Triggers.find_all_data_trigger_targets(
+        realm,
+        device_id,
+        groups,
+        :on_incoming_data,
+        interface_id,
+        endpoint_id,
+        path,
+        value,
+        Map.from_struct(state)
+      )
+    )
+
     Triggers.find_all_data_trigger_targets(
       realm,
       device_id,
diff --git a/tools/astarte_e2e/lib/astarte_e2e/amqp_data_trigger.ex b/tools/astarte_e2e/lib/astarte_e2e/amqp_data_trigger.ex
index 0a793cb10a..c1c58770e5 100644
--- a/tools/astarte_e2e/lib/astarte_e2e/amqp_data_trigger.ex
+++ b/tools/astarte_e2e/lib/astarte_e2e/amqp_data_trigger.ex
@@ -227,6 +227,7 @@ defmodule AstarteE2E.AmqpDataTrigger do
           %{
             "type" => "data_trigger",
             "on" => "incoming_data",
+            "device_id" => encoded_device_id,
             "interface_name" => properties_interface.interface_name,
             "interface_major" => properties_interface.version_major,
             "match_path" => "/*",
diff --git a/tools/astarte_e2e/lib/astarte_e2e/amqp_device_trigger.ex b/tools/astarte_e2e/lib/astarte_e2e/amqp_device_trigger.ex
index ac64bd10ff..fd4dbd235a 100644
--- a/tools/astarte_e2e/lib/astarte_e2e/amqp_device_trigger.ex
+++ b/tools/astarte_e2e/lib/astarte_e2e/amqp_device_trigger.ex
@@ -135,11 +135,12 @@ defmodule AstarteE2E.AmqpDeviceTrigger do
         {:reply, :ok, state, {:continue, :stop}}
 
       other ->
+        Logger.info(state)
         Logger.info("AMQP Device Trigger: unexpected event #{inspect(other)}",
           device_id: state.device_id
         )
 
-        {:reply, {:error, :unexpected_trigger}, state}
+        {:reply, {:error, :unexpected_trigger}, %{}}
     end
   end
 
diff --git a/tools/astarte_e2e/lib/astarte_e2e/task_scheduler.ex b/tools/astarte_e2e/lib/astarte_e2e/task_scheduler.ex
index 05e841beba..aefde20244 100644
--- a/tools/astarte_e2e/lib/astarte_e2e/task_scheduler.ex
+++ b/tools/astarte_e2e/lib/astarte_e2e/task_scheduler.ex
@@ -44,7 +44,7 @@ defmodule AstarteE2E.TaskScheduler do
     checks = [
       AstarteE2E.AmqpDataTrigger,
       AstarteE2E.AmqpDeviceTrigger,
-      AstarteE2E.DataTrigger,
+      # AstarteE2E.DataTrigger,
       AstarteE2E.DeviceTrigger,
       AstarteE2E.DeviceDeletion,
       AstarteE2E.VolatileTriggerRoundtrip.Executor