diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index 2d6a14f08..98310cf53 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -537,6 +537,12 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
    if (!CanStopAudioStream())
       return -1;
 
+   bool useMidi = true;
+
+   // Remove these lines to experiment with scrubbing/seeking of note tracks
+   if (options.pScrubbingOptions)
+      useMidi = false;
+
    // Uncomment this for laughs!
    // backwards = true;
 
@@ -582,7 +588,7 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
    for (Track *trk = iter.First(); trk; trk = iter.Next()) {
       if (trk->GetKind() == Track::Wave
 #ifdef EXPERIMENTAL_MIDI_OUT
-         || trk->GetKind() == Track::Note
+         || (trk->GetKind() == Track::Note && useMidi)
 #endif
          ) {
          hasaudio = true;
@@ -667,7 +673,9 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
                mCutPreviewTracks->GetWaveTrackConstArray(false),
                WaveTrackArray(),
 #ifdef EXPERIMENTAL_MIDI_OUT
-               mCutPreviewTracks->GetNoteTrackArray(false),
+               useMidi
+                  ? mCutPreviewTracks->GetNoteTrackArray(false)
+                  : NoteTrackArray(),
 #endif
                tcp0, tcp1, myOptions);
          }
@@ -685,7 +693,9 @@ int ControlToolBar::PlayPlayRegion(const SelectedRegion &selectedRegion,
          token = gAudioIO->StartStream(t->GetWaveTrackConstArray(false),
                                        WaveTrackArray(),
 #ifdef EXPERIMENTAL_MIDI_OUT
-                                       t->GetNoteTrackArray(false),
+                                       useMidi
+                                          ? t->GetNoteTrackArray(false)
+                                          : NoteTrackArray(),
 #endif
                                        t0, t1, options);
       }