diff --git a/src/buffer.cpp b/src/buffer.cpp
index 8a59f6ea..d497ef85 100755
--- a/src/buffer.cpp
+++ b/src/buffer.cpp
@@ -77,28 +77,9 @@ bool CNetBuf::Get ( CVector<uint8_t>& vecbyData )
         return false;
     }
 
-    // check for invalid data in buffer (not applicable for simulation
-    // buffers)
-    if ( ( iNumInvalidElements > 0 ) && !bIsSimulation )
-    {
-        // decrease number of invalid elements by one
-        iNumInvalidElements -= 1;
-
-        // return error flag, do not return function here since we have
-        // to call the base Get function to pick one block out of the
-        // buffer
-        bGetOK = false;
-    }
-
-    // check if there is not enough data available -> correct
+    // check if there is not enough data available
     if ( GetAvailData() < iInSize )
     {
-        // in case we have a buffer underrun, invalidate the next 15 blocks
-        // to avoid the unmusical noise resulting from a very short drop
-        // out (note that if you want to change this value, also change
-        // the value in cc6_celt_decode_lost in cc6_celt.c)
-        iNumInvalidElements = 10;
-
         return false;
     }
 
diff --git a/src/buffer.h b/src/buffer.h
index a21879d1..da7e0e75 100755
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -383,7 +383,6 @@ public:
 
 protected:
     int iBlockSize;
-    int iNumInvalidElements;
 };