diff --git a/Modulator.cpp b/Modulator.cpp
index 7ca242772..e6bf3da1d 100644
--- a/Modulator.cpp
+++ b/Modulator.cpp
@@ -127,8 +127,8 @@ void Modulator::close ()
 qint64 Modulator::readData (char * data, qint64 maxSize)
 {
   static int j0=-1;
-  static double toneFrequency0;
-  double toneFrequency;
+  static double toneFrequency0=1500.0;
+  double toneFrequency=1500.0;
 
   if(maxSize==0) return 0;
   Q_ASSERT (!(maxSize % qint64 (bytesPerFrame ()))); // no torn frames
diff --git a/mainwindow.cpp b/mainwindow.cpp
index b69b52356..fba7153d1 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1980,7 +1980,7 @@ void MainWindow::guiUpdate()
         m_lastMessageType = m_currentMessageType;
       }
     m_currentMessageType = 0;
-    if(m_tune) {
+    if(m_tune or m_mode=="Echo") {
       itone[0]=0;
     } else {
       if(m_modeTx=="JT4") gen4_(message, &ichk , msgsent, const_cast<int *> (itone),