diff --git a/Cargo.lock b/Cargo.lock
index e229f0f1..243c9741 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2283,7 +2283,7 @@ dependencies = [
 
 [[package]]
 name = "omnect-device-service"
-version = "0.41.6"
+version = "0.41.7"
 dependencies = [
  "actix-server",
  "actix-web",
diff --git a/Cargo.toml b/Cargo.toml
index d9908931..838713f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 name = "omnect-device-service"
 readme = "README.md"
 repository = "https://github.com/omnect/omnect-device-service.git"
-version = "0.41.6"
+version = "0.41.7"
 
 [dependencies]
 actix-server = { version = "2.6", default-features = false }
diff --git a/src/twin/mod.rs b/src/twin/mod.rs
index a0e76f67..833f5d6b 100644
--- a/src/twin/mod.rs
+++ b/src/twin/mod.rs
@@ -436,16 +436,20 @@ impl Twin {
                     twin.handle_request(requests).await?
                 },
                 Some(reported) = rx_reported_properties.recv() => {
-                    twin.client
-                        .as_ref()
-                        .context("couldn't report properties since client not present")?
-                        .twin_report(reported)?
+                    let Some(client) = &twin.client else {
+                        error!("couldn't report properties since client not present");
+                        continue
+                    };
+
+                    client.twin_report(reported)?
                 },
                 Some(message) = rx_outgoing_message.recv() => {
-                    twin.client
-                        .as_ref()
-                        .context("couldn't send msg since client not present")?
-                        .send_d2c_message(message)?
+                    let Some(client) = &twin.client else {
+                        error!("couldn't send msg since client not present");
+                        continue
+                    };
+
+                    client.send_d2c_message(message)?
                 },
             );
         }