diff --git a/sdrbase/dsp/samplesinkfifo.cpp b/sdrbase/dsp/samplesinkfifo.cpp
index 66a3d4287..e3908d4b6 100644
--- a/sdrbase/dsp/samplesinkfifo.cpp
+++ b/sdrbase/dsp/samplesinkfifo.cpp
@@ -22,7 +22,6 @@
 
 void SampleSinkFifo::create(unsigned int s)
 {
-	m_size = 0;
 	m_fill = 0;
 	m_head = 0;
 	m_tail = 0;
@@ -85,6 +84,11 @@ bool SampleSinkFifo::setSize(int size)
 unsigned int SampleSinkFifo::write(const quint8* data, unsigned int count)
 {
 	QMutexLocker mutexLocker(&m_mutex);
+
+	if (m_size == 0) {
+		return 0;
+	}
+
 	unsigned int total;
 	unsigned int remaining;
 	unsigned int len;
@@ -139,6 +143,11 @@ unsigned int SampleSinkFifo::write(const quint8* data, unsigned int count)
 unsigned int SampleSinkFifo::write(SampleVector::const_iterator begin, SampleVector::const_iterator end)
 {
 	QMutexLocker mutexLocker(&m_mutex);
+
+	if (m_size == 0) {
+		return 0;
+	}
+
 	unsigned int count = end - begin;
 	unsigned int total;
 	unsigned int remaining;
@@ -192,6 +201,11 @@ unsigned int SampleSinkFifo::write(SampleVector::const_iterator begin, SampleVec
 unsigned int SampleSinkFifo::read(SampleVector::iterator begin, SampleVector::iterator end)
 {
 	QMutexLocker mutexLocker(&m_mutex);
+
+	if (m_size == 0) {
+		return 0;
+	}
+
 	unsigned int count = end - begin;
 	unsigned int total;
 	unsigned int remaining;
@@ -224,6 +238,11 @@ unsigned int SampleSinkFifo::readBegin(unsigned int count,
 	SampleVector::iterator* part2Begin, SampleVector::iterator* part2End)
 {
 	QMutexLocker mutexLocker(&m_mutex);
+
+	if (m_size == 0) {
+		return 0;
+	}
+
 	unsigned int total;
 	unsigned int remaining;
 	unsigned int len;
@@ -271,6 +290,10 @@ unsigned int SampleSinkFifo::readCommit(unsigned int count)
 {
 	QMutexLocker mutexLocker(&m_mutex);
 
+	if (m_size == 0) {
+		return 0;
+	}
+
 	if (count > m_fill)
     {
 		qCritical("SampleSinkFifo::readCommit: cannot commit more than available samples");
@@ -286,4 +309,4 @@ unsigned int SampleSinkFifo::readCommit(unsigned int count)
 unsigned int SampleSinkFifo::getSizePolicy(unsigned int sampleRate)
 {
     return (sampleRate/100)*64; // .64s
-}
\ No newline at end of file
+}