diff --git a/server/SHServ/Models/Devices.php b/server/SHServ/Models/Devices.php
index fade0c0..85c3089 100644
--- a/server/SHServ/Models/Devices.php
+++ b/server/SHServ/Models/Devices.php
@@ -123,33 +123,23 @@
 		}
 
 		$response = $device -> device_api() -> reset();
-		if($response["http_code"] != 200) {
-			return [
-				"result" => false,
-				"err_alias" => "device_request_fail"
-			];
+		$device_msg = "";
+
+		if($response["http_code"] == 200 && ($response["data"]["status"] ?? null) == "ok") {
+			$device_msg = $response["data"]["message"] ?? "";
+		} else {
+			$device_msg = app() -> text_msg("device_removed_offline");
 		}
 
-		if($response["data"]["status"] == "ok") {
-			// status killed in device_auth table
-			$device_auth -> kill();
+		// status killed in device_auth table
+		$device_auth -> kill();
 
-			// remove from devices
-			$device -> remove();
-
-			return [
-				"result" => true,
-				"device_msg" => $response["data"]["message"] ?? ""
-			];
-		}
-
-		$err_type = $response["data"]["error"] ?? "undefined_error";
-		$err_msg = $response["data"]["message"] ?? "Unknown error";
+		// remove from devices
+		$device -> remove();
 
 		return [
-			"result" => false,
-			"err_alias" => "device_request_fail",
-			"device_msg" => "<b>{$err_type}</b>. {$err_msg}"
+			"result" => true,
+			"device_msg" => $device_msg
 		];
 	}
 
diff --git a/server/SHServ/text-msgs.php b/server/SHServ/text-msgs.php
index f2d5e48..9d28e83 100644
--- a/server/SHServ/text-msgs.php
+++ b/server/SHServ/text-msgs.php
@@ -31,6 +31,7 @@
 	"unknown_device" => "",
 	"error_of_device_auth" => "",
 	"device_request_fail" => "Устройство не отвечает",
+	"device_removed_offline" => "Устройство не отвечает, удалено только из системы",
 	"device_mode_error" => "",
 	"db_error" => "",
 	"device_error_of_auth" => "",