diff --git a/app/src/main/rs/decoder.rs b/app/src/main/rs/decoder.rs
index 3ab1c06..19b4bca 100644
--- a/app/src/main/rs/decoder.rs
+++ b/app/src/main/rs/decoder.rs
@@ -51,6 +51,7 @@ static void reset_buffer()
 
 static void save_buffer()
 {
+    free_running = 1;
     if (!buffer_cleared)
         return;
     buffer_cleared = 0;
@@ -63,7 +64,7 @@ static void save_buffer()
 static void robot36_decoder()
 {
     static prev_timeout;
-    if (!buffer_cleared && !prev_timeout && 2 * abs(seperator_counter) > seperator_length)
+    if (free_running && !prev_timeout && 2 * abs(seperator_counter) > seperator_length)
         vpos = (~1 & vpos) | (seperator_counter > 0);
     prev_timeout = hpos >= maximum_length;
     if (vpos & 1) {
@@ -186,13 +187,17 @@ void decode(int samples) {
 
         if (*current_mode != mode_debug) {
             int detected_mode = calibration_detector(dat_value, dat_active, cnt_active, cnt_quantized);
-            if (detected_mode >= 0)
+            if (detected_mode >= 0) {
+                free_running = 0;
                 reset_buffer();
-            switch_mode(detected_mode);
+                switch_mode(detected_mode);
+            }
             int estimated_mode = scanline_estimator(sync_level);
-            if (estimated_mode >= 0 && estimated_mode != *current_mode)
+            if (estimated_mode >= 0 && estimated_mode != *current_mode) {
+                free_running = 1;
                 reset_buffer();
-            switch_mode(estimated_mode);
+                switch_mode(estimated_mode);
+            }
         }
 
         int u_sep = u_sep_begin <= hpos && hpos < u_sep_end;
diff --git a/app/src/main/rs/initialization.rsh b/app/src/main/rs/initialization.rsh
index 7d12707..f4a570e 100644
--- a/app/src/main/rs/initialization.rsh
+++ b/app/src/main/rs/initialization.rsh
@@ -33,6 +33,7 @@ void initialize(float rate, int length, int width, int height)
     sync_counter = 0;
     seperator_counter = 0;
     buffer_cleared = 0;
+    free_running = 1;
     minimum_length = 0.05f * sample_rate;
     minimum_sync_length = 0.002f * sample_rate;
 
diff --git a/app/src/main/rs/state.rsh b/app/src/main/rs/state.rsh
index 7346637..11201d1 100644
--- a/app/src/main/rs/state.rsh
+++ b/app/src/main/rs/state.rsh
@@ -21,7 +21,7 @@ static ema_t avg_power, leader_lowpass;
 static ddc_t cnt_ddc, dat_ddc;
 static fmd_t cnt_fmd, dat_fmd;
 static int current_decoder;
-static int blur_power;
+static int blur_power, free_running;
 static int sample_rate, prev_hpos;
 static int maximum_variance, minimum_sync_length;
 static int scanline_length, minimum_length, maximum_length;