diff --git a/plugins/channelrx/remotesink/remotesink.cpp b/plugins/channelrx/remotesink/remotesink.cpp
index 1d725d215..fe93af7d5 100644
--- a/plugins/channelrx/remotesink/remotesink.cpp
+++ b/plugins/channelrx/remotesink/remotesink.cpp
@@ -143,7 +143,7 @@ void RemoteSink::feed(const SampleVector::const_iterator& begin, const SampleVec
             }
 
             boost::crc_32_type crc32;
-            crc32.process_bytes(&metaData, 24);
+            crc32.process_bytes(&metaData, sizeof(RemoteMetaDataFEC)-4);
             metaData.m_crc32 = crc32.checksum();
             RemoteSuperBlock& superBlock = m_dataBlock->m_superBlocks[0]; // first block
             superBlock.init();
diff --git a/plugins/channeltx/remotesource/remotesource.cpp b/plugins/channeltx/remotesource/remotesource.cpp
index cd8f3b1af..61c6d80f4 100644
--- a/plugins/channeltx/remotesource/remotesource.cpp
+++ b/plugins/channeltx/remotesource/remotesource.cpp
@@ -321,7 +321,7 @@ void RemoteSource::handleDataBlock(RemoteDataBlock* dataBlock)
         {
             RemoteMetaDataFEC *metaData = (RemoteMetaDataFEC *) &(dataBlock->m_superBlocks[0].m_protectedBlock);
             boost::crc_32_type crc32;
-            crc32.process_bytes(metaData, 24);
+            crc32.process_bytes(metaData, sizeof(RemoteMetaDataFEC)-4);
 
             if (crc32.checksum() == metaData->m_crc32)
             {
diff --git a/plugins/samplesink/remoteoutput/udpsinkfec.cpp b/plugins/samplesink/remoteoutput/udpsinkfec.cpp
index ee1908e99..619833769 100644
--- a/plugins/samplesink/remoteoutput/udpsinkfec.cpp
+++ b/plugins/samplesink/remoteoutput/udpsinkfec.cpp
@@ -134,7 +134,7 @@ void UDPSinkFEC::write(const SampleVector::iterator& begin, uint32_t sampleChunk
             metaData.m_tv_usec = ts_usecs % 1000000UL;
 
             boost::crc_32_type crc32;
-            crc32.process_bytes(&metaData, 24);
+            crc32.process_bytes(&metaData, sizeof(RemoteMetaDataFEC)-4);
 
             metaData.m_crc32 = crc32.checksum();
 
diff --git a/plugins/samplesource/remoteinput/remoteinputbuffer.cpp b/plugins/samplesource/remoteinput/remoteinputbuffer.cpp
index bb115cb1c..dcedd6197 100644
--- a/plugins/samplesource/remoteinput/remoteinputbuffer.cpp
+++ b/plugins/samplesource/remoteinput/remoteinputbuffer.cpp
@@ -284,7 +284,7 @@ void RemoteInputBuffer::writeData(char *array)
                         RemoteMetaDataFEC *metaData = (RemoteMetaDataFEC *) recoveredBlock;
 
                         boost::crc_32_type crc32;
-                        crc32.process_bytes(metaData, 24);
+                        crc32.process_bytes(metaData, sizeof(RemoteMetaDataFEC)-4);
 
                         if (crc32.checksum() == metaData->m_crc32)
                         {