diff --git a/js/speech.js b/js/speech.js
index 840dc78..a060b29 100644
--- a/js/speech.js
+++ b/js/speech.js
@@ -166,7 +166,11 @@ function Speech(texts, options) {
           }
           break
         case "end":
-          cmd$.next({name: "forward"})
+          if (piperState) {
+            cmd$.complete()
+          } else {
+            cmd$.next({name: "forward"})
+          }
           break
       }
     },