diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 7a84afd16..d0ff595f8 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -2891,16 +2891,12 @@ void CClient::Update()
 	{
 		if(m_pMapdownloadTask->State() == HTTP_DONE)
 			FinishMapDownload();
-		else if(m_pMapdownloadTask->State() == HTTP_ERROR)
+		else if(m_pMapdownloadTask->State() == HTTP_ERROR || m_pMapdownloadTask->State() == HTTP_ABORTED)
 		{
 			dbg_msg("webdl", "http failed, falling back to gameserver");
 			ResetMapDownload();
 			SendMapRequest();
 		}
-		else if(m_pMapdownloadTask->State() == HTTP_ABORTED)
-		{
-			m_pMapdownloadTask = NULL;
-		}
 	}
 
 	if(m_pDDNetInfoTask)