diff --git a/device/device.cpp b/device/device.cpp
index 92386fc..6b2e9f7 100644
--- a/device/device.cpp
+++ b/device/device.cpp
@@ -613,6 +613,11 @@ bool Device::goOffline() {
 		return true;
 	}
 
+	if(assignedClientId.has_value()) {
+		unlockAllNetworks();
+		assignedClientId.reset();
+	}
+	
 	if(!enableNetworkCommunication(false))
 		return false;