diff --git a/ChangeLog b/ChangeLog
index 1e982bb6c..4989fbe6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@ release 0.14.3
 
 	* added python binding for create_torrent
 	* fixed boost-1.38 build
+	* fixed bug where web seeds would be connected before the files
+	  were checked
 
 release 0.14.2
 
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 5473312c7..367d74580 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -4674,7 +4674,7 @@ namespace libtorrent
 		}
 
 		// if we have everything we want we don't need to connect to any web-seed
-		if (!is_finished() && !m_web_seeds.empty())
+		if (!is_finished() && !m_web_seeds.empty() && m_files_checked)
 		{
 			// keep trying web-seeds if there are any
 			// first find out which web seeds we are connected to