diff --git a/src/tribler-core/tribler_core/components/metadata_store/remote_query_community/eva_protocol.py b/src/tribler-core/tribler_core/components/ipv8/eva_protocol.py
similarity index 100%
rename from src/tribler-core/tribler_core/components/metadata_store/remote_query_community/eva_protocol.py
rename to src/tribler-core/tribler_core/components/ipv8/eva_protocol.py
diff --git a/src/tribler-core/tribler_core/components/metadata_store/remote_query_community/tests/test_eva_protocol.py b/src/tribler-core/tribler_core/components/ipv8/tests/test_eva_protocol.py
similarity index 99%
rename from src/tribler-core/tribler_core/components/metadata_store/remote_query_community/tests/test_eva_protocol.py
rename to src/tribler-core/tribler_core/components/ipv8/tests/test_eva_protocol.py
index 0a223e3c7fe..f1f913dfd9c 100644
--- a/src/tribler-core/tribler_core/components/metadata_store/remote_query_community/tests/test_eva_protocol.py
+++ b/src/tribler-core/tribler_core/components/ipv8/tests/test_eva_protocol.py
@@ -12,7 +12,7 @@
 
 import pytest
 
-from tribler_core.components.metadata_store.remote_query_community.eva_protocol import (
+from tribler_core.components.ipv8.eva_protocol import (
     Acknowledgement,
     EVAProtocol,
     EVAProtocolMixin,
diff --git a/src/tribler-core/tribler_core/components/metadata_store/remote_query_community/remote_query_community.py b/src/tribler-core/tribler_core/components/metadata_store/remote_query_community/remote_query_community.py
index 66506284ceb..a62f58f0cd8 100644
--- a/src/tribler-core/tribler_core/components/metadata_store/remote_query_community/remote_query_community.py
+++ b/src/tribler-core/tribler_core/components/metadata_store/remote_query_community/remote_query_community.py
@@ -15,7 +15,7 @@
 from tribler_core.components.metadata_store.db.orm_bindings.channel_metadata import LZ4_EMPTY_ARCHIVE, entries_to_chunk
 from tribler_core.components.metadata_store.db.serialization import CHANNEL_TORRENT, COLLECTION_NODE, REGULAR_TORRENT
 from tribler_core.components.metadata_store.db.store import MetadataStore
-from tribler_core.components.metadata_store.remote_query_community.eva_protocol import EVAProtocolMixin
+from tribler_core.components.ipv8.eva_protocol import EVAProtocolMixin
 from tribler_core.components.metadata_store.remote_query_community.payload_checker import ObjState
 from tribler_core.components.metadata_store.remote_query_community.settings import RemoteQueryCommunitySettings
 from tribler_core.components.metadata_store.utils import RequestTimeoutException