diff --git a/src/net/i2p/android/router/loader/AddressEntry.java b/src/net/i2p/android/router/loader/AddressEntry.java
index d48d48ff644ae5f26b59157d1edf0650a3177414..7c62cf77e4a43ef17764fdeb4ece1cf07e32ae41 100644
--- a/src/net/i2p/android/router/loader/AddressEntry.java
+++ b/src/net/i2p/android/router/loader/AddressEntry.java
@@ -1,6 +1,6 @@
 package net.i2p.android.router.loader;
 
-public class AddressEntry implements Comparable<Object> {
+public class AddressEntry {
     private final String mHostName;
 
     public AddressEntry(String hostName) {
@@ -10,10 +10,4 @@ public class AddressEntry implements Comparable<Object> {
     public String getHostName() {
         return mHostName;
     }
-
-    public int compareTo(Object another) {
-        if (another instanceof AddressEntry)
-            return -1;
-        return mHostName.compareTo(((AddressEntry) another).getHostName());
-    }
 }
diff --git a/src/net/i2p/android/router/loader/AddressEntryLoader.java b/src/net/i2p/android/router/loader/AddressEntryLoader.java
index 9d0ae9fd1bdfafa2a47a6379a4c4192c40ec4dc9..39bbbec56a541953810604e5dec449de0eec1812 100644
--- a/src/net/i2p/android/router/loader/AddressEntryLoader.java
+++ b/src/net/i2p/android/router/loader/AddressEntryLoader.java
@@ -1,8 +1,10 @@
 package net.i2p.android.router.loader;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
 import net.i2p.android.router.util.Util;
 import net.i2p.client.naming.NamingService;
 import net.i2p.router.RouterContext;
@@ -29,11 +31,12 @@ public class AddressEntryLoader extends AsyncTaskLoader<List<AddressEntry>> {
         Util.i("NamingService: " + ns.getName());
         // After router shutdown we get nothing... why?
         List<AddressEntry> ret = new ArrayList<AddressEntry>();
-        for (String hostName : ns.getNames()) {
+        Set<String> names = new TreeSet<String>();
+        names.addAll(ns.getNames());
+        for (String hostName : names) {
             AddressEntry name = new AddressEntry(hostName);
             ret.add(name);
         }
-        Collections.sort(ret);
         return ret;
     }