diff --git a/executorch-custom/jni_layer_tts.cpp b/executorch-custom/jni_layer_tts.cpp
index 04fabdc..f74e88f 100644
--- a/executorch-custom/jni_layer_tts.cpp
+++ b/executorch-custom/jni_layer_tts.cpp
@@ -839,23 +839,19 @@ ExecuTorchJni::runTtsPipelineImpl(
         for(int i=0;i<NUM_CB;i++) allCodes.push_back(codes[i]);
         cb0Hist.push_back(curCb0);
 
-        // Next embed: codec_sum + (trailing text / eos / pad)
+        // Next embed: pre-computed from Python (complete: codec_sum+text)
+        // After exhausted: codec_sum(our codes) + pad
         float nextEmb[DIM]={};
-        // Always add codec embeddings from our codes
-        const float*e0=codecEmb.data()+std::min(std::max(codes[0],0),VOCAB-1)*DIM;
-        for(int k=0;k<DIM;k++) nextEmb[k]+=e0[k];
-        for(int cb=0;cb<15;cb++){
-            const float*ec=cpEmbs.data()+((long)cb*CB_SIZE+std::min(std::max(codes[cb+1],0),CB_SIZE-1))*DIM;
-            for(int k=0;k<DIM;k++) nextEmb[k]+=ec[k];
-        }
-        // Add trailing text embed, then eos once, then pad
         if(trIdx<nTrailing){
-            const float*te=trailing.data()+trIdx*DIM;
-            for(int k=0;k<DIM;k++) nextEmb[k]+=te[k];
+            memcpy(nextEmb,trailing.data()+trIdx*DIM,DIM*4);
             trIdx++;
-        } else if(trIdx==nTrailing){
-            for(int k=0;k<DIM;k++) nextEmb[k]+=eosEmb[k]; trIdx++;
         } else {
+            const float*e0=codecEmb.data()+std::min(std::max(codes[0],0),VOCAB-1)*DIM;
+            for(int k=0;k<DIM;k++) nextEmb[k]+=e0[k];
+            for(int cb=0;cb<15;cb++){
+                const float*ec=cpEmbs.data()+((long)cb*CB_SIZE+std::min(std::max(codes[cb+1],0),CB_SIZE-1))*DIM;
+                for(int k=0;k<DIM;k++) nextEmb[k]+=ec[k];
+            }
             for(int k=0;k<DIM;k++) nextEmb[k]+=padEmb[k];
         }