diff --git a/src/steps/sharding.py b/src/steps/sharding.py
index 5086a57f0..96be02f49 100644
--- a/src/steps/sharding.py
+++ b/src/steps/sharding.py
@@ -22,7 +22,7 @@ class StepsSharding(StepsRelay):
     test_content_topic = "/myapp/1/latest/proto"
     test_pubsub_topic = "/waku/2/rs/2/0"
     test_payload = "Sharding works!!"
-    auto_cluster = 2
+    auto_cluster = 199
     num_shards_in_network = 8
 
     @pytest.fixture(scope="function", autouse=True)
diff --git a/src/test_data.py b/src/test_data.py
index 02ad8c2fc..866dda8df 100644
--- a/src/test_data.py
+++ b/src/test_data.py
@@ -96,7 +96,7 @@ CONTENT_TOPICS_SHARD_7 = [
     "/newsService/4.0/updates/yaml",
 ]
 
-DEFAULT_CLUSTER_ID = "3"
+DEFAULT_CLUSTER_ID = "198"
 VALID_PUBSUB_TOPICS = [
     f"/waku/2/rs/{DEFAULT_CLUSTER_ID}/0",
     f"/waku/2/rs/{DEFAULT_CLUSTER_ID}/1",
diff --git a/tests/sharding/test_relay_static_sharding.py b/tests/sharding/test_relay_static_sharding.py
index 07e632d72..aef848819 100644
--- a/tests/sharding/test_relay_static_sharding.py
+++ b/tests/sharding/test_relay_static_sharding.py
@@ -96,14 +96,7 @@ class TestRelayStaticSharding(StepsSharding):
 
     def test_unsubscribe_from_non_subscribed_pubsub_topics(self):
         self.setup_main_relay_nodes(cluster_id=self.auto_cluster, pubsub_topic=self.test_pubsub_topic)
-        try:
-            self.unsubscribe_main_relay_nodes(pubsub_topics=PUBSUB_TOPICS_SAME_CLUSTER)
-            if self.node1.is_nwaku():
-                pass
-            else:
-                raise AssertionError("Unsubscribe from non-subscribed pubsub_topic worked!!!")
-        except Exception as ex:
-            assert "Bad Request" in str(ex) or "Internal Server Error" in str(ex)
+        self.unsubscribe_main_relay_nodes(pubsub_topics=PUBSUB_TOPICS_SAME_CLUSTER)
         for pubsub_topic in PUBSUB_TOPICS_SAME_CLUSTER:
             self.check_publish_fails_on_not_subscribed_pubsub_topic(pubsub_topic)