diff --git a/source/updateCheck.py b/source/updateCheck.py
index 103797f7881..19a24db7773 100644
--- a/source/updateCheck.py
+++ b/source/updateCheck.py
@@ -252,6 +252,9 @@ def checkForUpdate(auto: bool = False) -> UpdateInfo | None:
 		raise RuntimeError(f"Checking for update failed with HTTP status code {res.code}.")
 
 	data = res.read().decode("utf-8")  # Ensure the response is decoded correctly
+	# if data is empty, we return None, because the server returns an empty response if there is no update.
+	if not data:
+		return None
 	try:
 		parsed_response = UpdateInfo.parseUpdateCheckResponse(data)
 	except ValueError:
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
index 315eae2e4cf..a2fff994402 100644
--- a/user_docs/en/changes.md
+++ b/user_docs/en/changes.md
@@ -30,7 +30,7 @@ To use this feature, "allow NVDA to control the volume of other applications" mu
 * NVDA can now report when a link destination points to the current page. (#141, @LeonarddeR, @nvdaes)
 * Added an action in the Add-on Store to cancel the install of add-ons. (#15578, @hwf1324)
 * Added an action in the Add-on Store to retry the installation if the download/installation of an add-on fails. (#17090, @hwf1324)
-* It is now possible to specify mirror URLs to use for NVDA updates and the Add-on Store. (#14974, #17151, #17310, @christopherpross)
+* It is now possible to specify mirror URLs to use for NVDA updates and the Add-on Store. (#14974, #17151, #17310, #17804, @christopherpross)
 * The add-ons lists in the Add-on Store can be sorted by columns, including publication date, in ascending and descending order. (#15277, #16681, @nvdaes)
 * When decreasing or increasing the font size in LibreOffice Writer using the corresponding keyboard shortcuts, NVDA announces the new font size. (#6915, @michaelweghorn)
 * When applying the "Body Text" or a heading paragraph style using the corresponding keyboard shortcut in LibreOffice Writer 25.2 or newer, NVDA announces the new paragraph style. (#6915, @michaelweghorn)