diff --git a/implementation/routing/src/event.cpp b/implementation/routing/src/event.cpp
index 8f5b44ce4..755b15148 100644
--- a/implementation/routing/src/event.cpp
+++ b/implementation/routing/src/event.cpp
@@ -685,9 +685,7 @@ event::get_filtered_subscribers(bool _force) {
 
     if (filters_.empty()) {
 
-        bool must_forward = (type_ != event_type_e::ET_FIELD
-                || _force
-                || epsilon_change_func_(its_payload, its_payload_update));
+        bool must_forward = _force || epsilon_change_func_(its_payload, its_payload_update);
 
         if (must_forward)
             return its_subscribers;
@@ -704,10 +702,7 @@ event::get_filtered_subscribers(bool _force) {
                     its_filtered_subscribers.insert(s);
             } else {
                 if (is_allowed == 0xff) {
-                    is_allowed = (type_ != event_type_e::ET_FIELD
-                        || _force
-                        || epsilon_change_func_(its_payload, its_payload_update)
-                        ? 0x01 : 0x00);
+                    is_allowed = (_force || epsilon_change_func_(its_payload, its_payload_update) ? 0x01 : 0x00);
                 }
 
                 if (is_allowed == 0x01)
diff --git a/implementation/routing/src/routing_manager_base.cpp b/implementation/routing/src/routing_manager_base.cpp
index 047e6566e..f6b35d884 100644
--- a/implementation/routing/src/routing_manager_base.cpp
+++ b/implementation/routing/src/routing_manager_base.cpp
@@ -503,7 +503,7 @@ void routing_manager_base::register_event(client_t _client,
                 // Create a new callback for this client if filter interval is used
                 register_debounce(its_debounce, _client, its_event);
             } else {
-                if (!_is_shadow && is_routing_manager()) {
+                if ((_type != vsomeip_v3::event_type_e::ET_EVENT) && !_is_shadow && is_routing_manager()) {
                     _epsilon_change_func = [](const std::shared_ptr<payload> &_old,
                                         const std::shared_ptr<payload> &_new) {
                         bool is_change = (_old->get_length() != _new->get_length());