diff --git a/src/node/waku_node.py b/src/node/waku_node.py
index fe11f3ceec..8acae3d35d 100644
--- a/src/node/waku_node.py
+++ b/src/node/waku_node.py
@@ -86,7 +86,6 @@ class WakuNode:
         if self.is_gowaku():
             go_waku_args = {
                 "min-relay-peers-to-publish": "1",
-                "legacy-filter": "false",
                 "log-level": "DEBUG",
                 "rest-filter-cache-capacity": "50",
             }
diff --git a/src/steps/filter.py b/src/steps/filter.py
index f457ae0727..8f0b34d526 100644
--- a/src/steps/filter.py
+++ b/src/steps/filter.py
@@ -182,7 +182,7 @@ class StepsFilter:
             self.ping_filter_subscriptions(str(uuid4()), node=node)
             raise AssertionError("Ping without any subscription worked")
         except Exception as ex:
-            assert "peer has no subscription" in str(ex)
+            assert "peer has no subscription" in str(ex) or "ping request failed" in str(ex)
 
     @allure.step
     def add_new_relay_subscription(self, pubsub_topics, node=None):