diff --git a/nymea-networkmanager/core.cpp b/nymea-networkmanager/core.cpp
index 84a103a..7b3f3cc 100644
--- a/nymea-networkmanager/core.cpp
+++ b/nymea-networkmanager/core.cpp
@@ -211,6 +211,11 @@ void Core::onBluetoothServerRunningChanged(bool running)
 void Core::onBluetoothServerConnectedChanged(bool connected)
 {
     qCDebug(dcApplication()) << "Bluetooth client" << (connected ? "connected" : "disconnected");
+    if (!connected) {
+        // Restart bluetooth server if a client disconnected
+        m_bluetoothServer->stop();
+        m_bluetoothServer->start(m_networkManager->wirelessNetworkDevices().first());
+    }
 }
 
 void Core::onNetworkManagerAvailableChanged(const bool &available)