diff --git a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
index 8a2cf684c01970541fe7dfb03249659011f39caa..978f536da3521bf89317bf1fc4d874fb12e4da15 100644
--- a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
+++ b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
@@ -120,7 +120,6 @@ class BluetoothPlugin extends AbstractPlugin implements StreamPlugin {
 				return;
 			}
 			socket = scn;
-			setLocalBluetoothAddress(localDevice.getBluetoothAddress());
 		}
 		startContactAccepterThread();
 	}
@@ -145,18 +144,14 @@ class BluetoothPlugin extends AbstractPlugin implements StreamPlugin {
 		// Try to make the device discoverable (requires root on Linux)
 		try {
 			localDevice.setDiscoverable(DiscoveryAgent.GIAC);
+			TransportProperties p = callback.getLocalProperties();
+			p.put("address", localDevice.getBluetoothAddress());
+			callback.setLocalProperties(p);
 		} catch(BluetoothStateException e) {
 			if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.getMessage());
 		}
 	}
 
-	private synchronized void setLocalBluetoothAddress(String address) {
-		assert started;
-		TransportProperties p = callback.getLocalProperties();
-		p.put("address", address);
-		callback.setLocalProperties(p);
-	}
-
 	private void startContactAccepterThread() {
 		new Thread() {
 			@Override