diff --git a/api/net/sf/briar/api/TransportConfig.java b/api/net/sf/briar/api/TransportConfig.java
index e57d8388d..da2c8bbc0 100644
--- a/api/net/sf/briar/api/TransportConfig.java
+++ b/api/net/sf/briar/api/TransportConfig.java
@@ -1,9 +1,9 @@
 package net.sf.briar.api;
 
+import java.util.Hashtable;
 import java.util.Map;
-import java.util.TreeMap;
 
-public class TransportConfig extends TreeMap<String, String> {
+public class TransportConfig extends Hashtable<String, String> {
 
 	private static final long serialVersionUID = 2330384620787778596L;
 
diff --git a/api/net/sf/briar/api/TransportProperties.java b/api/net/sf/briar/api/TransportProperties.java
index 8eda0706c..df87c7d3a 100644
--- a/api/net/sf/briar/api/TransportProperties.java
+++ b/api/net/sf/briar/api/TransportProperties.java
@@ -1,9 +1,9 @@
 package net.sf.briar.api;
 
+import java.util.Hashtable;
 import java.util.Map;
-import java.util.TreeMap;
 
-public class TransportProperties extends TreeMap<String, String> {
+public class TransportProperties extends Hashtable<String, String> {
 
 	private static final long serialVersionUID = 7533739534204953625L;