diff --git a/Sming/Libraries/OtaNetwork/src/HttpUpgrader.cpp b/Sming/Libraries/OtaNetwork/src/HttpUpgrader.cpp
index 96b7c0080f..75d6674900 100644
--- a/Sming/Libraries/OtaNetwork/src/HttpUpgrader.cpp
+++ b/Sming/Libraries/OtaNetwork/src/HttpUpgrader.cpp
@@ -22,6 +22,10 @@ void HttpUpgrader::start()
 
 void HttpUpgrader::fetchNextItem()
 {
+	if(currentItem >= items.count()) {
+		return;
+	}
+
 	auto& it = items[currentItem];
 	debug_d("Download file:\r\n"
 			"    (%u) %s -> %s @ 0x%X",