diff --git a/libs/cloud/picloudclient.cpp b/libs/cloud/picloudclient.cpp
index db0729c1..4a88b807 100644
--- a/libs/cloud/picloudclient.cpp
+++ b/libs/cloud/picloudclient.cpp
@@ -45,14 +45,10 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
 
 PICloudClient::~PICloudClient() {
 	//piCoutObj << "~PICloudClient()";
-
 	stopAndWait();
-	//piCoutObj << "~PICloudClient() closed";
-	internalDisconnect();
-//	stop(false);
+	close();
 	is_deleted = true;
 	internalDisconnect();
-	//piCoutObj << "~PICloudClient() done";
 }
 
 
diff --git a/libs/cloud/picloudserver.cpp b/libs/cloud/picloudserver.cpp
index c968bff1..98704297 100644
--- a/libs/cloud/picloudserver.cpp
+++ b/libs/cloud/picloudserver.cpp
@@ -30,6 +30,7 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
 	CONNECTL(&eth, disconnected, [this](bool){
 		piCoutObj << "disconnected";
 		eth.softStopThreadedRead();
+		eth.interrupt();
 		opened_ = false;
 		ping_timer.stop(false);
 		piMSleep(100);
@@ -129,8 +130,8 @@ PICloudServer::Client::~Client() {
 		is_connected = false;
 		cond_buff.notifyOne();
 	}
+	stopAndWait();
 	close();
-	stop();
 }
 
 
@@ -140,7 +141,6 @@ bool PICloudServer::Client::openDevice() {
 
 
 bool PICloudServer::Client::closeDevice() {
-	softStopThreadedRead();
 	if (is_connected) {
 		server->clientDisconnect(client_id);
 		is_connected = false;
diff --git a/utils/cloud_dispatcher/dispatcherclient.cpp b/utils/cloud_dispatcher/dispatcherclient.cpp
index b2d53fd4..b370ebb7 100644
--- a/utils/cloud_dispatcher/dispatcherclient.cpp
+++ b/utils/cloud_dispatcher/dispatcherclient.cpp
@@ -28,7 +28,7 @@ PIString DispatcherClient::address() {
 
 void DispatcherClient::close() {
 	eth->softStopThreadedRead();
-	eth->close();
+	eth->interrupt();
 }