diff --git a/src/client/DownloadManager.cpp b/src/client/DownloadManager.cpp
index e82cd447aa..b30ef01277 100644
--- a/src/client/DownloadManager.cpp
+++ b/src/client/DownloadManager.cpp
@@ -38,7 +38,8 @@ void DownloadManager::Shutdown()
 	managerShutdown = true;
 	pthread_mutex_unlock(&downloadAddLock);
 	pthread_mutex_unlock(&downloadLock);
-	pthread_join(downloadThread, NULL);
+	if (downloadThread)
+		pthread_join(downloadThread, NULL);
 }
 
 //helper function for download