diff --git a/Bluejay.asm b/Bluejay.asm
index 41d80d1..badfece 100644
--- a/Bluejay.asm
+++ b/Bluejay.asm
@@ -1788,6 +1788,10 @@ scheduler_steps_even:
 	; Otherwise hard stuttering is produced
 
 scheduler_steps_even_demag_metric_frame:
+	; Check telemetry is enable to produce telemetry frames
+	jb Flag_Ext_Tele, scheduler_steps_even_demag_metric_frame
+	jmp scheduler_exit
+
 	; ********************* [TELEMETRY] SEND DEMAG METRIC FRAME *****************
 	mov Ext_Telemetry_L, Demag_Detected_Metric	; Set telemetry low value to demag metric data
 	mov Ext_Telemetry_H, #0Ch					; Set telemetry high value to demag metric frame ID
@@ -1825,6 +1829,9 @@ scheduler_steps_odd_temp_pwm_limit_inc:
 	; Now run speciffic odd scheduler step
 
 scheduler_steps_odd_choose_step:
+    ; Check telemetry is enable to produce telemetry frames
+    jnb Flag_Ext_Tele, scheduler_steps_odd_restart_ADC
+
 	; Let A = Scheduler_Counter % 8, so A = [0 - 7] value
 	mov A, Scheduler_Counter
 	anl A, #07h
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1030905..207cf16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 
 ## [0.16.2](https://github.com/mathiasvr/bluejay/compare/v0.16...v0.16.2)
-* From now on the release notes should be used as a referenct to what changed. This Changelog will those not be continuted anymore.
+* From now on the release notes should be used as a reference to what changed. This Changelog will thus not be continuted anymore.
 
 ### Chores
 * Updated links to point to new repository ([#4](https://github.com/bird-sanctuary/bluejay/pull/4))