diff --git a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
index 7a80a30d0ca1f..9691c27d25ca5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
@@ -330,7 +330,7 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
         msgIdx = 5000;
         // We don't use the code‑generated serializer for CompressedMessage - serialization is highly customized.
         factory.register(msgIdx++, CompressedMessage::new);
-        withSchema(ErrorMessage.class);
+        withNoSchema(ErrorMessage.class);
         withNoSchema(InetSocketAddressMessage.class);
         withNoSchema(InetAddressMessage.class);
         withNoSchema(TcpDiscoveryNode.class);
@@ -435,71 +435,71 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
 
         // [10000 - 10200]: Transaction and lock related messages. Most of the originally comes from Communication.
         msgIdx = 10000;
-        withSchema(TxInfo.class);
-        withSchema(TxEntriesInfo.class);
-        withSchema(TxLock.class);
-        withSchema(TxLocksRequest.class);
-        withSchema(TxLocksResponse.class);
-        withSchema(IgniteTxKey.class);
-        withSchema(IgniteTxEntry.class);
-        withSchema(TxEntryValueHolder.class);
-        withSchema(GridCacheTxRecoveryRequest.class);
-        withSchema(GridCacheTxRecoveryResponse.class);
-        withSchema(GridDistributedTxFinishRequest.class);
-        withSchema(GridDistributedTxFinishResponse.class);
-        withSchema(GridDistributedTxPrepareRequest.class);
-        withSchema(GridDistributedTxPrepareResponse.class);
-        withSchema(GridDhtTxFinishRequest.class);
-        withSchema(GridDhtTxFinishResponse.class);
-        withSchema(GridDhtTxPrepareRequest.class);
-        withSchema(GridDhtTxPrepareResponse.class);
-        withSchema(GridNearTxFinishRequest.class);
-        withSchema(GridNearTxFinishResponse.class);
-        withSchema(GridNearTxPrepareRequest.class);
-        withSchema(GridNearTxPrepareResponse.class);
-        withSchema(GridDhtLockRequest.class);
-        withSchema(GridDhtLockResponse.class);
-        withSchema(GridDhtUnlockRequest.class);
-        withSchema(GridNearLockRequest.class);
-        withSchema(GridNearLockResponse.class);
-        withSchema(GridNearUnlockRequest.class);
-        withSchema(GridDistributedLockRequest.class);
-        withSchema(GridDistributedLockResponse.class);
-        withSchema(GridDhtTxOnePhaseCommitAckRequest.class);
-        withSchema(TransactionAttributesAwareRequest.class);
+        withNoSchema(TxInfo.class);
+        withNoSchema(TxEntriesInfo.class);
+        withNoSchema(TxLock.class);
+        withNoSchema(TxLocksRequest.class);
+        withNoSchema(TxLocksResponse.class);
+        withNoSchema(IgniteTxKey.class);
+        withNoSchema(IgniteTxEntry.class);
+        withNoSchema(TxEntryValueHolder.class);
+        withNoSchema(GridCacheTxRecoveryRequest.class);
+        withNoSchema(GridCacheTxRecoveryResponse.class);
+        withNoSchema(GridDistributedTxFinishRequest.class);
+        withNoSchema(GridDistributedTxFinishResponse.class);
+        withNoSchema(GridDistributedTxPrepareRequest.class);
+        withNoSchema(GridDistributedTxPrepareResponse.class);
+        withNoSchema(GridDhtTxFinishRequest.class);
+        withNoSchema(GridDhtTxFinishResponse.class);
+        withNoSchema(GridDhtTxPrepareRequest.class);
+        withNoSchema(GridDhtTxPrepareResponse.class);
+        withNoSchema(GridNearTxFinishRequest.class);
+        withNoSchema(GridNearTxFinishResponse.class);
+        withNoSchema(GridNearTxPrepareRequest.class);
+        withNoSchema(GridNearTxPrepareResponse.class);
+        withNoSchema(GridDhtLockRequest.class);
+        withNoSchema(GridDhtLockResponse.class);
+        withNoSchema(GridDhtUnlockRequest.class);
+        withNoSchema(GridNearLockRequest.class);
+        withNoSchema(GridNearLockResponse.class);
+        withNoSchema(GridNearUnlockRequest.class);
+        withNoSchema(GridDistributedLockRequest.class);
+        withNoSchema(GridDistributedLockResponse.class);
+        withNoSchema(GridDhtTxOnePhaseCommitAckRequest.class);
+        withNoSchema(TransactionAttributesAwareRequest.class);
 
         // [10300 - 10500]: Cache, DHT messages.
         msgIdx = 10300;
-        withSchema(GridDhtForceKeysRequest.class);
-        withSchema(GridDhtForceKeysResponse.class);
-        withSchema(GridDhtAtomicDeferredUpdateResponse.class);
-        withSchema(GridDhtAtomicUpdateRequest.class);
-        withSchema(GridDhtAtomicUpdateResponse.class);
-        withSchema(GridNearAtomicFullUpdateRequest.class);
-        withSchema(GridDhtAtomicSingleUpdateRequest.class);
-        withSchema(GridNearAtomicUpdateResponse.class);
-        withSchema(GridNearAtomicSingleUpdateRequest.class);
-        withSchema(GridNearAtomicSingleUpdateInvokeRequest.class);
-        withSchema(GridNearAtomicSingleUpdateFilterRequest.class);
-        withSchema(GridNearAtomicCheckUpdateRequest.class);
-        withSchema(NearCacheUpdates.class);
-        withSchema(GridNearGetRequest.class);
-        withSchema(GridNearGetResponse.class);
-        withSchema(GridNearSingleGetRequest.class);
-        withSchema(GridNearSingleGetResponse.class);
-        withSchema(GridDhtAtomicNearResponse.class);
-        withSchema(GridCacheTtlUpdateRequest.class);
-        withSchema(GridCacheReturn.class);
-        withSchema(GridCacheEntryInfo.class);
-        withSchema(CacheInvokeDirectResult.class);
-        withSchema(GridCacheRawVersionedEntry.class);
-        withSchema(CacheEvictionEntry.class);
-        withSchema(CacheEntryPredicateAdapter.class);
-        withSchema(GridContinuousMessage.class);
-        withSchema(ContinuousRoutineStartResultMessage.class);
-        withSchema(UpdateErrors.class);
-        withSchema(LatchAckMessage.class);
-        withSchema(AtomicApplicationAttributesAwareRequest.class);
+        withNoSchema(GridDhtForceKeysRequest.class);
+        withNoSchema(GridDhtForceKeysResponse.class);
+        withNoSchema(GridDhtAtomicDeferredUpdateResponse.class);
+        withNoSchema(GridDhtAtomicUpdateRequest.class);
+        withNoSchema(GridDhtAtomicUpdateResponse.class);
+        withNoSchema(GridNearAtomicFullUpdateRequest.class);
+        withNoSchema(GridDhtAtomicSingleUpdateRequest.class);
+        withNoSchema(GridNearAtomicUpdateResponse.class);
+        withNoSchema(GridNearAtomicSingleUpdateRequest.class);
+        withNoSchema(GridNearAtomicSingleUpdateInvokeRequest.class);
+        withNoSchema(GridNearAtomicSingleUpdateFilterRequest.class);
+        withNoSchema(GridNearAtomicCheckUpdateRequest.class);
+        withNoSchema(NearCacheUpdates.class);
+        withNoSchema(GridNearGetRequest.class);
+        withNoSchema(GridNearGetResponse.class);
+        withNoSchema(GridNearSingleGetRequest.class);
+        withNoSchema(GridNearSingleGetResponse.class);
+        withNoSchema(GridDhtAtomicNearResponse.class);
+        withNoSchema(GridCacheTtlUpdateRequest.class);
+        withNoSchema(GridCacheReturn.class);
+        withNoSchema(GridCacheEntryInfo.class);
+        withNoSchema(CacheInvokeDirectResult.class);
+        withNoSchema(GridCacheRawVersionedEntry.class);
+        withNoSchema(CacheEvictionEntry.class);
+        withNoSchema(CacheEntryPredicateAdapter.class);
+        withNoSchema(GridContinuousMessage.class);
+        withNoSchema(ContinuousRoutineStartResultMessage.class);
+        withNoSchema(UpdateErrors.class);
+        withNoSchema(LatchAckMessage.class);
+        withNoSchema(AtomicApplicationAttributesAwareRequest.class);
         withNoSchema(StartRequestData.class);
         withNoSchema(StartRoutineDiscoveryMessage.class);
         withNoSchema(StartRoutineAckDiscoveryMessage.class);
@@ -507,25 +507,25 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
 
         // [10600-10800]: Affinity & partition maps.
         msgIdx = 10600;
-        withSchema(GridDhtAffinityAssignmentRequest.class);
-        withSchema(GridDhtAffinityAssignmentResponse.class);
-        withSchema(CacheGroupAffinityMessage.class);
-        withSchema(ExchangeInfo.class);
-        withSchema(PartitionUpdateCountersMessage.class);
-        withSchema(CachePartitionPartialCountersMap.class);
-        withSchema(IgniteDhtDemandedPartitionsMap.class);
-        withSchema(CachePartitionFullCountersMap.class);
-        withSchema(GroupPartitionIdPair.class);
-        withSchema(GridPartitionStateMap.class);
-        withSchema(GridDhtPartitionMap.class);
-        withSchema(GridDhtPartitionFullMap.class);
+        withNoSchema(GridDhtAffinityAssignmentRequest.class);
+        withNoSchema(GridDhtAffinityAssignmentResponse.class);
+        withNoSchema(CacheGroupAffinityMessage.class);
+        withNoSchema(ExchangeInfo.class);
+        withNoSchema(PartitionUpdateCountersMessage.class);
+        withNoSchema(CachePartitionPartialCountersMap.class);
+        withNoSchema(IgniteDhtDemandedPartitionsMap.class);
+        withNoSchema(CachePartitionFullCountersMap.class);
+        withNoSchema(GroupPartitionIdPair.class);
+        withNoSchema(GridPartitionStateMap.class);
+        withNoSchema(GridDhtPartitionMap.class);
+        withNoSchema(GridDhtPartitionFullMap.class);
         withNoSchema(GridDhtPartitionExchangeId.class);
         withNoSchema(GridCheckpointRequest.class);
-        withSchema(GridDhtPartitionDemandMessage.class);
-        withSchema(GridDhtPartitionSupplyMessage.class);
-        withSchema(GridDhtPartitionsFullMessage.class);
-        withSchema(GridDhtPartitionsSingleMessage.class);
-        withSchema(GridDhtPartitionsSingleRequest.class);
+        withNoSchema(GridDhtPartitionDemandMessage.class);
+        withNoSchema(GridDhtPartitionSupplyMessage.class);
+        withNoSchema(GridDhtPartitionsFullMessage.class);
+        withNoSchema(GridDhtPartitionsSingleMessage.class);
+        withNoSchema(GridDhtPartitionsSingleRequest.class);
 
         // [10900-11100]: Query, schema and SQL related messages.
         msgIdx = 10900;
@@ -538,18 +538,18 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
         withNoSchema(SchemaProposeDiscoveryMessage.class);
         withNoSchema(SchemaFinishDiscoveryMessage.class);
         withNoSchema(QueryField.class);
-        withSchema(GridCacheSqlQuery.class);
-        withSchema(GridCacheQueryRequest.class);
-        withSchema(GridCacheQueryResponse.class);
-        withSchema(GridQueryCancelRequest.class);
-        withSchema(GridQueryFailResponse.class);
-        withSchema(GridQueryNextPageRequest.class);
-        withSchema(GridQueryNextPageResponse.class);
-        withSchema(GridQueryKillRequest.class);
-        withSchema(GridQueryKillResponse.class);
-        withSchema(IndexKeyDefinition.class);
-        withSchema(IndexKeyTypeSettings.class);
-        withSchema(IndexQueryResultMeta.class);
+        withNoSchema(GridCacheSqlQuery.class);
+        withNoSchema(GridCacheQueryRequest.class);
+        withNoSchema(GridCacheQueryResponse.class);
+        withNoSchema(GridQueryCancelRequest.class);
+        withNoSchema(GridQueryFailResponse.class);
+        withNoSchema(GridQueryNextPageRequest.class);
+        withNoSchema(GridQueryNextPageResponse.class);
+        withNoSchema(GridQueryKillRequest.class);
+        withNoSchema(GridQueryKillResponse.class);
+        withNoSchema(IndexKeyDefinition.class);
+        withNoSchema(IndexKeyTypeSettings.class);
+        withNoSchema(IndexQueryResultMeta.class);
         withNoSchema(StatisticsKeyMessage.class);
         withNoSchema(StatisticsDecimalMessage.class);
         withNoSchema(StatisticsObjectData.class);
@@ -557,7 +557,7 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
         withNoSchema(StatisticsRequest.class);
         withNoSchema(StatisticsResponse.class);
         withNoSchema(CacheContinuousQueryBatchAck.class);
-        withSchema(CacheContinuousQueryEntry.class);
+        withNoSchema(CacheContinuousQueryEntry.class);
 
         // [11200 - 11300]: Compute, distributed process messages.
         msgIdx = 11200;
@@ -578,10 +578,10 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
         withNoSchema(NodeIdMessage.class);
         withNoSchema(HandshakeMessage.class);
         withNoSchema(HandshakeWaitMessage.class);
-        withSchema(GridIoMessage.class);
+        withNoSchema(GridIoMessage.class);
         withNoSchema(IgniteIoTestMessage.class);
-        withSchema(GridIoUserMessage.class);
-        withSchema(GridIoSecurityAwareMessage.class);
+        withNoSchema(GridIoUserMessage.class);
+        withNoSchema(GridIoSecurityAwareMessage.class);
         withNoSchema(RecoveryLastReceivedMessage.class);
         withNoSchema(TcpInverseConnectionResponseMessage.class);
         withNoSchema(SessionChannelMessage.class);
@@ -589,7 +589,7 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
         // [11700 - 11800]: Datastreamer messages.
         msgIdx = 11700;
         withNoSchema(DataStreamerUpdatesHandlerResult.class);
-        withSchema(DataStreamerEntry.class);
+        withNoSchema(DataStreamerEntry.class);
         withNoSchema(DataStreamerRequest.class);
         withNoSchema(DataStreamerResponse.class);
 
@@ -636,8 +636,8 @@ public CoreMessagesProvider(Marshaller schemaAwareMarhaller, Marshaller schemaLe
         withSchema(GridEventStorageMessage.class);
         withNoSchema(ChangeGlobalStateMessage.class);
         withNoSchema(GridChangeGlobalStateMessageResponse.class);
-        withSchema(IgniteDiagnosticRequest.class);
-        withSchema(IgniteDiagnosticResponse.class);
+        withNoSchema(IgniteDiagnosticRequest.class);
+        withNoSchema(IgniteDiagnosticResponse.class);
         withNoSchema(WalStateAckMessage.class);
 
         assert msgIdx <= MAX_MESSAGE_ID;