diff --git a/core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy b/core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy
index 9d3a87a9..503c9236 100644
--- a/core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy
+++ b/core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy
@@ -42,9 +42,10 @@ class H2HostCache extends HostCache {
     protected synchronized void hostDiscovered(Destination d, boolean fromHostcache) {
         // overwrite MC with optimistic values 
         if (fromHostcache) {
-            sql.execute("delete from HOST_ATTEMPTS where DESTINATION='${d.toBase64()}';")
+            sql.execute("delete from HOST_ATTEMPTS where DESTINATION=${d.toBase64()}")
             profiles.put(d, new HostMCProfile())
-        } else if (uniqueHosts.add(d)) {
+        }
+        if (uniqueHosts.add(d)) {
             allHosts.add(d)
             profiles.put(d, new HostMCProfile())
         }
@@ -55,6 +56,11 @@ class H2HostCache extends HostCache {
         
         log.fine("onConnection ${d.toBase32()} status $status")
         
+        if (status == ConnectionAttemptStatus.SUCCESSFUL && uniqueHosts.add(d)) {
+            allHosts.add(d)
+            profiles.put(d, new HostMCProfile())
+        }
+        
         // record into db
         def timestamp = new Date(System.currentTimeMillis())
         timestamp = SDF.format(timestamp)