diff --git a/services/audioflinger/SpdifStreamOut.cpp b/services/audioflinger/SpdifStreamOut.cpp
index 45b541a..ac637ef 100644
--- a/services/audioflinger/SpdifStreamOut.cpp
+++ b/services/audioflinger/SpdifStreamOut.cpp
@@ -128,7 +128,7 @@
 
 int SpdifStreamOut::flush()
 {
-    // FIXME Is there an issue here with flush being asynchronous?
+    mSpdifEncoder.reset();
     mRenderPositionHal = 0;
     mPreviousHalPosition32 = 0;
     return AudioStreamOut::flush();
@@ -136,6 +136,7 @@
 
 int SpdifStreamOut::standby()
 {
+    mSpdifEncoder.reset();
     mRenderPositionHal = 0;
     mPreviousHalPosition32 = 0;
     return AudioStreamOut::standby();