diff --git a/src/shadows/mod.rs b/src/shadows/mod.rs
index 31ce599..c28cf3d 100644
--- a/src/shadows/mod.rs
+++ b/src/shadows/mod.rs
@@ -234,14 +234,17 @@ where
                                 response.state.delta.clone(),
                                 Some(false),
                             )?;
+                            Ok(response.state.delta)
                         } else if let Some(_) = response.state.reported {
                             self.handler.change_shadow_value(
                                 &mut state,
-                                response.state.reported,
-                                None,
+                                response.state.reported.clone(),
+                                Some(false),
                             )?;
+                            Ok(response.state.reported)
+                        } else {
+                            Ok(None)
                         }
-                        Ok(response.state.delta)
                     })?
             }
             Topic::GetRejected | Topic::UpdateRejected => {