diff --git a/src/buffer.cpp b/src/buffer.cpp
index 2388955c..9b19bf06 100755
--- a/src/buffer.cpp
+++ b/src/buffer.cpp
@@ -60,7 +60,7 @@ void CNetBuf::Init ( const int iNewBlockSize, const int iNewNumBlocks )
 	}
     else
 	{
-        iNumSamFadingExtra = FADE_IN_OUT_NUM_SAM;
+        iNumSamFadingExtra = FADE_IN_OUT_NUM_SAM_EXTRA;
 	}
 
     // init variables for extrapolation (in case a fade out is needed)
diff --git a/src/buffer.h b/src/buffer.h
index aad23d6a..f26ca4aa 100755
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -31,11 +31,11 @@
 
 /* Definitions ****************************************************************/
 // time for fading effect for masking drop outs
-#define FADE_IN_OUT_TIME            ( (double) 0.3 ) // ms
+#define FADE_IN_OUT_TIME            ( (double) 2 ) // ms
 #define FADE_IN_OUT_NUM_SAM         ( (int) ( SYSTEM_SAMPLE_RATE * FADE_IN_OUT_TIME ) / 1000 )
 
 // for extrapolation a shorter time for fading
-#define FADE_IN_OUT_NUM_SAM_EXTRA   5 // samples
+#define FADE_IN_OUT_NUM_SAM_EXTRA   10 // samples
 
 
 /* Classes ********************************************************************/