diff --git a/src/engine/platform/sid3.cpp b/src/engine/platform/sid3.cpp
index a7408b071..beb6cb585 100644
--- a/src/engine/platform/sid3.cpp
+++ b/src/engine/platform/sid3.cpp
@@ -736,7 +736,7 @@ void DivPlatformSID3::tick(bool sysTick)
 
       bool found = false;
       int index = 0;
-      while(noiseInterestingWavesData != 0 && !found)
+      while(noiseInterestingWavesData[index].LFSRmask != 0 && !found)
       {
         if(noiseInterestingWavesData[index].LFSRmask == chan[i].noiseLFSRMask)
         {
diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index 9668888b9..85356d658 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -5896,6 +5896,12 @@ void FurnaceGUI::drawInsSID3(DivInstrument* ins)
       if (ImGui::Button(_("noise"))) { PARAMETER
         ins->c64.noiseOn=!ins->c64.noiseOn;
       }
+      if (ImGui::IsItemHovered()) 
+      {
+        ImGui::SetTooltip(_("Like in SID2, specific noise LFSR feedback bits config can produce tonal waves.\n"
+        "Refer to the manual for LFSR bits macro configurations for which frequency calculation is altered\n"
+        "in a way that makes tonal noise stay in tune."));
+      }
       popToggleColors();
       ImGui::SameLine();