diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
index c9087bc7e70830672937c6beec56455e986fb4a9..46952d14a79d8b0a3c703913bef41d27bb53d6dc 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
@@ -313,9 +313,9 @@ public class TrackerClient extends I2PAppThread
         try
           {
             // try to contact everybody we can
-            // We don't need I2CP connection for eepget
-            // if (!verifyConnected()) return;
+            // Don't try to restart I2CP connection just to say goodbye
             for (Iterator iter = trackers.iterator(); iter.hasNext(); ) {
+              if (!verifyConnected()) return;
               Tracker tr = (Tracker)iter.next();
               if (tr.started && (!tr.stop) && tr.trackerProblems == null)
                   doRequest(tr, infoHash, peerID, uploaded,