diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
index ada14a2d1..887bd73b5 100644
--- a/tasmota/language/af_AF.h
+++ b/tasmota/language/af_AF.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Stroom L1+L2+L3"
 #define D_SpL1L2L3 "Spanning L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
index 649e00e24..e966f0662 100644
--- a/tasmota/language/bg_BG.h
+++ b/tasmota/language/bg_BG.h
@@ -584,7 +584,7 @@
 #define D_StL1L2L3 "Ток L1+L2+L3"
 #define D_SpL1L2L3 "Напрежение L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
index acd29ff2d..30c91935f 100644
--- a/tasmota/language/cs_CZ.h
+++ b/tasmota/language/cs_CZ.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
index 40afbd61d..7fd63790f 100644
--- a/tasmota/language/de_DE.h
+++ b/tasmota/language/de_DE.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Ströme L1+L2+L3"
 #define D_SpL1L2L3 "Spannung L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signalstärke"
 #define D_CHIPTEMPERATURE "Chip Temperatur"
 
diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
index d4e8b1bc5..7db3f5f25 100644
--- a/tasmota/language/el_GR.h
+++ b/tasmota/language/el_GR.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
index 3dab7a2ba..260b5281f 100644
--- a/tasmota/language/en_GB.h
+++ b/tasmota/language/en_GB.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
index c8b3be4c0..ed5d32f31 100644
--- a/tasmota/language/es_ES.h
+++ b/tasmota/language/es_ES.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Corriente L1+L2+L3"
 #define D_SpL1L2L3 "Voltaje L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h
index 923664689..f0d9ea77a 100644
--- a/tasmota/language/fy_NL.h
+++ b/tasmota/language/fy_NL.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Streame L1+L2+L3"
 #define D_SpL1L2L3 "Foltaazje L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
index d3a7f7fe9..04866263f 100644
--- a/tasmota/language/he_HE.h
+++ b/tasmota/language/he_HE.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
index 68185612f..a18f61cea 100644
--- a/tasmota/language/hu_HU.h
+++ b/tasmota/language/hu_HU.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Áramerősség L1+L2+L3"
 #define D_SpL1L2L3 "Feszültség L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
index 540f5e007..58cde05d8 100644
--- a/tasmota/language/it_IT.h
+++ b/tasmota/language/it_IT.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Corrente L1+L2+L3"
 #define D_SpL1L2L3 "Tensione L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
index 0ed01d5b4..07218d28e 100644
--- a/tasmota/language/ko_KO.h
+++ b/tasmota/language/ko_KO.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
index 1c46cd6d6..69b33210e 100644
--- a/tasmota/language/nl_NL.h
+++ b/tasmota/language/nl_NL.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Stroom L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
index a0d24bd77..86f2bb96c 100644
--- a/tasmota/language/pl_PL.h
+++ b/tasmota/language/pl_PL.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Prąd suma"
 #define D_SpL1L2L3 "Prąd średni"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
index c9ebccf8b..a2190b65a 100644
--- a/tasmota/language/pt_BR.h
+++ b/tasmota/language/pt_BR.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
index c897c9208..e56c35c85 100644
--- a/tasmota/language/pt_PT.h
+++ b/tasmota/language/pt_PT.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Corrente F1+F2+F3"
 #define D_SpL1L2L3 "Tensão F1+F2+F3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
index 742665707..93f56aaf8 100644
--- a/tasmota/language/ro_RO.h
+++ b/tasmota/language/ro_RO.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h
index 678bfa859..41eb8b22a 100644
--- a/tasmota/language/ru_RU.h
+++ b/tasmota/language/ru_RU.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h
index 6f09c0444..5ddd6216f 100644
--- a/tasmota/language/sk_SK.h
+++ b/tasmota/language/sk_SK.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h
index df5ed9f0f..6858db33d 100644
--- a/tasmota/language/sv_SE.h
+++ b/tasmota/language/sv_SE.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h
index 4d83cc49e..d9b98f878 100644
--- a/tasmota/language/tr_TR.h
+++ b/tasmota/language/tr_TR.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h
index b49d5e6b5..b47c1543d 100644
--- a/tasmota/language/uk_UA.h
+++ b/tasmota/language/uk_UA.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h
index d309431f1..6d12d62a2 100644
--- a/tasmota/language/vi_VN.h
+++ b/tasmota/language/vi_VN.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Dòng L1+L2+L3"
 #define D_SpL1L2L3 "Điện áp L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h
index 4b0554dda..7cfc79ac8 100644
--- a/tasmota/language/zh_CN.h
+++ b/tasmota/language/zh_CN.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h
index 4ec8a94dd..3498ec214 100644
--- a/tasmota/language/zh_TW.h
+++ b/tasmota/language/zh_TW.h
@@ -585,7 +585,7 @@
 #define D_StL1L2L3 "Current L1+L2+L3"
 #define D_SpL1L2L3 "Voltage L1+L2+L3/3"
 
-// xsns_88_tfminiplus.ino
+// xsns_86_tfminiplus.ino
 #define D_SIGNALSTRENGTH "Signal Strength"
 #define D_CHIPTEMPERATURE "Chip Temperature"
 
diff --git a/tasmota/xsns_88_tfminiplus.ino b/tasmota/xsns_86_tfminiplus.ino
similarity index 90%
rename from tasmota/xsns_88_tfminiplus.ino
rename to tasmota/xsns_86_tfminiplus.ino
index 21be74478..341f097a0 100644
--- a/tasmota/xsns_88_tfminiplus.ino
+++ b/tasmota/xsns_86_tfminiplus.ino
@@ -1,5 +1,5 @@
 /*
-  xsns_88_tfminiplus.ino - TFmini Plus interface for Tasmota
+  xsns_86_tfminiplus.ino - TFmini Plus interface for Tasmota
 
   Created by Raphael Breiting on 12.11.2020.
 
@@ -68,7 +68,7 @@
 #include <TasmotaSerial.h>
 
 // Define driver ID
-#define XSNS_88 88
+#define XSNS_86 86
 
 // Use special no wait serial driver, should be always on
 #ifndef ESP32
@@ -83,7 +83,7 @@
 
 char Tfmp_buffer[TFMP_MAX_DATA_LEN + 1];
 
-struct xsns_88_tfminiplus
+struct xsns_86_tfminiplus
 {
     bool ready = false;
     uint16_t distance = 0;
@@ -216,30 +216,34 @@ void TfmpShow(bool json)
  * Interface
 \*********************************************************************************************/
 
-bool Xsns88(byte callback_id)
+bool Xsns86(byte callback_id)
 {
     bool result = false;
-    switch (callback_id) {
-        case FUNC_INIT:
-            TfmpInit();
-            break;
-        case FUNC_EVERY_SECOND:
-            TfmpTrigger();
-            TfmpProcessSerialData();
-            result = true;
-            break;
-        case FUNC_JSON_APPEND:
-            TfmpShow(1);
-            break;
+    if (FUNC_INIT == callback_id)
+    {
+        TfmpInit();
+    }
+    else if (TfmpSerial && tfminiplus_sensor.ready)
+    {
+        switch (callback_id) {
+            case FUNC_EVERY_SECOND:
+                TfmpTrigger();
+                TfmpProcessSerialData();
+                result = true;
+                break;
+            case FUNC_JSON_APPEND:
+                TfmpShow(1);
+                break;
 #ifdef USE_WEBSERVER
-        case FUNC_WEB_SENSOR:
-            TfmpShow(0);
-            break;
+            case FUNC_WEB_SENSOR:
+                TfmpShow(0);
+                break;
 #endif  // USE_WEBSERVER
-        case FUNC_SAVE_BEFORE_RESTART:
-            break;
-        case FUNC_COMMAND:
-            break;
+            case FUNC_SAVE_BEFORE_RESTART:
+                break;
+            case FUNC_COMMAND:
+                break;
+        }
     }
     return result;
 }