diff --git a/Software/VNA_embedded/Application/Hardware.cpp b/Software/VNA_embedded/Application/Hardware.cpp
index dc675a5..3d0da00 100644
--- a/Software/VNA_embedded/Application/Hardware.cpp
+++ b/Software/VNA_embedded/Application/Hardware.cpp
@@ -250,6 +250,8 @@ void HW::SetIdle() {
 	FPGA::Enable(FPGA::Periphery::RefMixer, false);
 	FPGA::Enable(FPGA::Periphery::PortSwitch, false);
 	activeMode = Mode::Idle;
+	VNA::SetWaitingInStandby(false);
+
 }
 
 HW::AmplitudeSettings HW::GetAmplitudeSettings(int16_t cdbm, uint64_t freq, bool applyCorrections, bool port2) {
@@ -303,7 +305,7 @@ bool HW::TimedOut() {
 	auto bufISR = lastISR;
 	uint64_t now = Delay::get_us();
 	uint64_t timeSinceLast = now - bufISR;
-	if(activeMode != Mode::Idle && activeMode != Mode::Generator && !VNA::GetStandbyMode() && timeSinceLast > timeout) {
+	if(activeMode != Mode::Idle && activeMode != Mode::Generator && !VNA::IsWaitingInStandby() && timeSinceLast > timeout) {
 		LOG_WARN("Timed out, last ISR was at %lu%06lu, now %lu%06lu"
 				, (uint32_t) (bufISR / 1000000), (uint32_t)(bufISR%1000000)
 				, (uint32_t) (now / 1000000), (uint32_t)(now%1000000));
diff --git a/Software/VNA_embedded/Application/VNA.hpp b/Software/VNA_embedded/Application/VNA.hpp
index 1c4b352..a411085 100644
--- a/Software/VNA_embedded/Application/VNA.hpp
+++ b/Software/VNA_embedded/Application/VNA.hpp
@@ -9,6 +9,8 @@ namespace VNA {
 bool Setup(Protocol::SweepSettings s);
 void InitiateSweep();
 bool GetStandbyMode();
+bool IsWaitingInStandby();
+void SetWaitingInStandby(bool waiting);
 bool MeasurementDone(const FPGA::SamplingResult &result);
 void Work();
 void SweepHalted();