diff --git a/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp b/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp
index 5aeb37d65a9c3dd4bd0c4a7b9a04f251c485df3e..0220c2534c98a07a549e8e2fe7c471e0bd41f22d 100644
--- a/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp
+++ b/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp
@@ -871,13 +871,14 @@ void RHD2000Editor::buttonEvent(Button* button)
 
 void RHD2000Editor::channelChanged (int channel, bool /*newState*/)
 {
+    // Audio output is tied to DAC channels 0 and 1
     for (int i = 0; i < 2; i++)
     {
         if (electrodeButtons[i]->getToggleState())
         {
             electrodeButtons[i]->setChannelNum (channel);
             electrodeButtons[i]->repaint();
-            board->setDACchannel (i, channel);
+            board->setDACchannel (i, channel - 1); // HW channels are zero-based
         }
     }
 }
diff --git a/Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp b/Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp
index 1376f93a976be2e62cd301e98ca55c55a79fd27e..63309e45d3bf1f776a622b80a042418b13cd2522 100644
--- a/Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp
+++ b/Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp
@@ -216,7 +216,7 @@ void RHD2000Thread::setDACchannel(int dacOutput, int channel)
             {
                 dacChannels[dacOutput] = channel - channelCount;
                 dacStream[dacOutput] = i;
-				break;
+                break;
             }
             else
             {
@@ -1666,7 +1666,7 @@ bool RHD2000Thread::updateBuffer()
 
     }
 
-	
+
     if (dacOutputShouldChange)
     {
 		std::cout << "DAC" << std::endl;