diff --git a/qmap/libqmap/qmapa.f90 b/qmap/libqmap/qmapa.f90
index 6c93a5ab1..c5a3702ee 100644
--- a/qmap/libqmap/qmapa.f90
+++ b/qmap/libqmap/qmapa.f90
@@ -62,11 +62,12 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb,         &
 
   do icand=1,ncand                        !Attempt to decode each candidate
      tsec=sec_midn() - tsec0
-! Don't start another decode attempt if it's too late...
-     if(nhsym.eq.160 .and. tsec.gt.4.0) exit
-     if(nhsym.eq.200 .and. tsec.gt.10.0) exit
-     if(nhsym.eq.330 .and. tsec.gt.6.0) exit
-     if(nhsym.eq.390 .and. tsec.gt.16.0) exit
+     if(ndiskdat.eq.0) then !No more realtime decode attempts if it's too late
+        if(nhsym.eq.130 .and. tsec.gt.6.0) exit
+        if(nhsym.eq.200 .and. tsec.gt.10.0) exit
+        if(nhsym.eq.330 .and. tsec.gt.6.0) exit
+        if(nhsym.eq.390 .and. tsec.gt.16.0) exit
+     endif
      f0=cand(icand)%f
      ntrperiod=cand(icand)%ntrperiod
      iseq=cand(icand)%iseq
diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp
index d966776ac..540ce0540 100644
--- a/qmap/mainwindow.cpp
+++ b/qmap/mainwindow.cpp
@@ -402,7 +402,7 @@ void MainWindow::dataSink(int k)
   bool bCallDecoder=false;
   if(ihsym < m_hsymStop) m_decode_called=false;
   if(ihsym==m_hsymStop and !m_decode_called) bCallDecoder=true; //Decode at t=58.5 s
-  if(ihsym==160) bCallDecoder=true;
+  if(ihsym==130) bCallDecoder=true;
   if(m_bAlso30 and (ihsym==200)) bCallDecoder=true;
   if(ihsym==330) bCallDecoder=true;
   if(ihsym==ihsym0) bCallDecoder=false;
@@ -916,7 +916,7 @@ void MainWindow::decode()                                       //decode()
 
   datcom_.ndiskdat=0;
 
-  if((!m_bAlso30 and (datcom2_.nhsym==330)) or (m_bAlso30 and (datcom2_.nhsym==160))) {
+  if((!m_bAlso30 and (datcom2_.nhsym==330)) or (m_bAlso30 and (datcom2_.nhsym==130))) {
     decodes_.ndecodes=0;    //Start the decode cycle with a clean slate
     m_fetched=0;
   }