diff --git a/src/CHANGES.md b/src/CHANGES.md
index 6c59822e..df48a2d9 100644
--- a/src/CHANGES.md
+++ b/src/CHANGES.md
@@ -1,5 +1,8 @@
 # Development Changes
 
+## 0.7.47 - 2023-09-07
+* fix boot loop #1140
+
 ## 0.7.46 - 2023-09-04
 * removed `delay` from ePaper
 * started improvements of `/system`
diff --git a/src/app.cpp b/src/app.cpp
index ca33a895..53feeb48 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -453,12 +453,15 @@ void app::tickSend(void) {
 
         int8_t maxLoop = MAX_NUM_INVERTERS;
         Inverter<> *iv = mSys.getInverterByPos(mSendLastIvId);
-        do {
+        while(maxLoop > 0) {
             do {
                 mSendLastIvId = ((MAX_NUM_INVERTERS - 1) == mSendLastIvId) ? 0 : mSendLastIvId + 1;
                 iv = mSys.getInverterByPos(mSendLastIvId);
             } while ((NULL == iv) && ((maxLoop--) > 0));
-        } while((!iv->config->enabled) && (maxLoop > 0));
+            if(NULL != iv)
+                if(iv->config->enabled)
+                    break;
+        }
 
         if (NULL != iv) {
             if (iv->config->enabled) {
diff --git a/src/defines.h b/src/defines.h
index 465bf201..13bb75a1 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       7
-#define VERSION_PATCH       46
+#define VERSION_PATCH       47
 
 //-------------------------------------
 typedef struct {
diff --git a/src/web/html/index.html b/src/web/html/index.html
index 4f723fed..a7c79c25 100644
--- a/src/web/html/index.html
+++ b/src/web/html/index.html
@@ -126,16 +126,13 @@
                         icon = iconWarn;
                         cl = "icon-warn";
                         avail = "disabled";
-                    }
-                    else if(false == i["is_avail"]) {
+                    } else if(false == i["is_avail"]) {
                         icon = iconInfo;
                         cl = "icon-info";
                         avail = "not yet available";
-                    }
-                    else if(0 == i["ts_last_success"]) {
+                    } else if(0 == i["ts_last_success"]) {
                         avail = "available but no data was received until now";
-                    }
-                    else {
+                    } else {
                         avail = "available and is ";
                         if(false == i["is_producing"])
                             avail += "not ";