diff --git a/src/engine/platform/ym2610.cpp b/src/engine/platform/ym2610.cpp
index a6f29e4b8..dd2447da4 100644
--- a/src/engine/platform/ym2610.cpp
+++ b/src/engine/platform/ym2610.cpp
@@ -698,7 +698,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
           immWrite(0x14,(end>>8)&0xff);
           immWrite(0x15,end>>16);
           immWrite(0x11,isMuted[c.chan]?0:(chan[c.chan].pan<<6));
-          immWrite(0x10,0x80); // start
+          immWrite(0x10,(s->loopStart>=0)?0x90:0x80); // start/repeat
           if (c.value!=DIV_NOTE_NULL) {
             chan[c.chan].note=c.value;
             chan[c.chan].baseFreq=NOTE_ADPCMB(chan[c.chan].note);
@@ -724,7 +724,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
           immWrite(0x14,(end>>8)&0xff);
           immWrite(0x15,end>>16);
           immWrite(0x11,isMuted[c.chan]?0:(chan[c.chan].pan<<6));
-          immWrite(0x10,0x80); // start
+          immWrite(0x10,(s->loopStart>=0)?0x90:0x80); // start/repeat
           chan[c.chan].baseFreq=(((unsigned int)s->rate)<<16)/(chipClock/144);
           chan[c.chan].freqChanged=true;
         }
diff --git a/src/engine/platform/ym2610b.cpp b/src/engine/platform/ym2610b.cpp
index edf9184d5..27bb2afbb 100644
--- a/src/engine/platform/ym2610b.cpp
+++ b/src/engine/platform/ym2610b.cpp
@@ -761,7 +761,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
           immWrite(0x14,(end>>8)&0xff);
           immWrite(0x15,end>>16);
           immWrite(0x11,isMuted[c.chan]?0:(chan[c.chan].pan<<6));
-          immWrite(0x10,0x80); // start
+          immWrite(0x10,(s->loopStart>=0)?0x90:0x80); // start/repeat
           if (c.value!=DIV_NOTE_NULL) {
             chan[c.chan].note=c.value;
             chan[c.chan].baseFreq=NOTE_ADPCMB(chan[c.chan].note);
@@ -787,7 +787,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
           immWrite(0x14,(end>>8)&0xff);
           immWrite(0x15,end>>16);
           immWrite(0x11,isMuted[c.chan]?0:(chan[c.chan].pan<<6));
-          immWrite(0x10,0x80); // start
+          immWrite(0x10,(s->loopStart>=0)?0x90:0x80); // start/repeat
           chan[c.chan].baseFreq=(((unsigned int)s->rate)<<16)/(chipClock/144);
           chan[c.chan].freqChanged=true;
         }
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 265624684..034afb4ac 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1309,18 +1309,25 @@ void FurnaceGUI::drawSampleEdit() {
       ImGui::Text("notes:");
       if (sample->loopStart>=0) {
         considerations=true;
-        ImGui::Text("- sample won't loop on Neo Geo ADPCM");
+        ImGui::Text("- sample won't loop on Neo Geo ADPCM-A");
         if (sample->loopStart&1) {
           ImGui::Text("- sample loop start will be aligned to the nearest even sample on Amiga");
         }
+        if (sample->loopStart>0) {
+          ImGui::Text("- sample loop start will be ignored on Neo Geo ADPCM-B");
+        }
       }
       if (sample->samples&1) {
         considerations=true;
         ImGui::Text("- sample length will be aligned to the nearest even sample on Amiga");
       }
+      if (sample->samples&511) {
+        considerations=true;
+        ImGui::Text("- sample length will be aligned to 512 sample on Neo Geo ADPCM");
+      }
       if (sample->samples>65535) {
         considerations=true;
-        ImGui::Text("- maximum sample length on Sega PCM is 65536 samples");
+        ImGui::Text("- maximum sample length on Sega PCM and QSound is 65536 samples");
       }
       if (sample->samples>2097151) {
         considerations=true;