diff --git a/src/net_processing.cpp b/src/net_processing.cpp
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3514,7 +3514,7 @@
         }
 
         if (!isAvalancheEnabled(gArgs)) {
-            Misbehaving(pfrom, 20, "unsolicited-" + msg_type);
+            // If avalanche is not enabled, ignore avalanche messages
             return;
         }
     }
diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py
--- a/test/functional/p2p_invalid_messages.py
+++ b/test/functional/p2p_invalid_messages.py
@@ -13,9 +13,6 @@
     MSG_TX,
     CBlockHeader,
     CInv,
-    msg_avahello,
-    msg_avapoll,
-    msg_avaresponse,
     msg_getdata,
     msg_headers,
     msg_inv,
@@ -69,7 +66,6 @@
         self.test_oversized_inv_msg()
         self.test_oversized_getdata_msg()
         self.test_oversized_headers_msg()
-        self.test_unsolicited_ava_messages()
         self.test_resource_exhaustion()
 
     def test_buffer(self):
@@ -269,26 +265,6 @@
         size = MAX_HEADERS_RESULTS + 1
         self.test_oversized_msg(msg_headers([CBlockHeader()] * size), size)
 
-    def test_unsolicited_ava_messages(self):
-        """Node 0 has avalanche disabled by default. If a node does not
-        advertise the avalanche service flag, it does not expect to receive
-        any avalanche related message and should consider it as spam.
-        """
-        conn = self.nodes[0].add_p2p_connection(P2PInterface())
-        with self.nodes[0].assert_debug_log(
-                ['Misbehaving', '(0 -> 20): unsolicited-avahello']):
-            msg = msg_avahello()
-            conn.send_and_ping(msg)
-        with self.nodes[0].assert_debug_log(
-                ['Misbehaving', '(20 -> 40): unsolicited-avapoll']):
-            msg = msg_avapoll()
-            conn.send_and_ping(msg)
-        with self.nodes[0].assert_debug_log(
-                ['Misbehaving', '(40 -> 60): unsolicited-avaresponse']):
-            msg = msg_avaresponse()
-            conn.send_and_ping(msg)
-        self.nodes[0].disconnect_p2ps()
-
     def test_resource_exhaustion(self):
         self.log.info("Test node stays up despite many large junk messages")
         conn = self.nodes[0].add_p2p_connection(P2PDataStore())