diff --git a/xm.js b/xm.js
index cf3b5c0..a2ec4b5 100644
--- a/xm.js
+++ b/xm.js
@@ -251,7 +251,8 @@ function next_row() {
         ch.inst = inst;
         // retrigger unless overridden below
         triggernote = true;
-        if (ch.samp) {
+        if (ch.note) {
+          ch.samp = inst.samples[inst.samplemap[ch.note]];
           ch.vol = ch.samp.vol;
           ch.pan = ch.samp.pan;
         }