diff --git a/code/espurna/ir.cpp b/code/espurna/ir.cpp
index b363532d..7422e297 100644
--- a/code/espurna/ir.cpp
+++ b/code/espurna/ir.cpp
@@ -67,9 +67,9 @@ Raw messages:
         uint8_t _ir_repeat_size = 0;   // size of repeat array
         uint16_t * _ir_raw;            // array for sending codes and repeat codes
     #else
-        uint8_t _ir_type = 0;          // Type of encoding
-        uint64_t _ir_code = 0;         // Code to transmit
-        uint16_t _ir_bits = 0;         // Code bits
+        decode_type_t _ir_type = UNUSED;    // Type of encoding
+        uint64_t _ir_code = 0;              // Code to transmit
+        uint16_t _ir_bits = 0;              // Code bits
     #endif
 
     uint8_t _ir_repeat = 0;            // count of times repeating of repeat_code
@@ -208,7 +208,7 @@ void _irMqttCallback(unsigned int type, const char * topic, const char * payload
 
                 if (col > 0) {
 
-                    _ir_type = data.toInt();
+                    _ir_type = static_cast<decode_type_t>(data.toInt());
                     _ir_code = strtoul(data.substring(col+1).c_str(), NULL, 10);
 
                     col = data.indexOf(":", col+1);
@@ -247,7 +247,7 @@ void _irTXLoop() {
         #if IR_USE_RAW
             _ir_sender.sendRaw(_ir_raw, _ir_repeat_size, _ir_freq);
         #else
-            _ir_sender.send((decode_type_t)_ir_type, _ir_code, _ir_bits);
+            _ir_sender.send(_ir_type, _ir_code, _ir_bits);
         #endif
 
         // Update repeat count