diff --git a/spa/plugins/bluez5/a2dp-sink.c b/spa/plugins/bluez5/a2dp-sink.c
index 10adb8212..248f02672 100644
--- a/spa/plugins/bluez5/a2dp-sink.c
+++ b/spa/plugins/bluez5/a2dp-sink.c
@@ -647,6 +647,7 @@ again:
 		spa_log_trace(this->log, NAME" %p: error flushing %s", this,
 				spa_strerror(written));
 		reset_buffer(this);
+		enable_flush(this, false);
 		return written;
 	}
 	else if (written > 0) {
@@ -660,6 +661,11 @@ again:
 
 		enable_flush(this, false);
 	}
+	else {
+		/* Don't want to flush yet, or failed to write anything */
+		spa_log_trace(this->log, NAME" %p: skip flush", this);
+		enable_flush(this, false);
+	}
 	return 0;
 }