diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h
index 742ef446ca..0e1c87f13d 100644
--- a/src/corelib/kernel/qproperty_p.h
+++ b/src/corelib/kernel/qproperty_p.h
@@ -486,11 +486,11 @@ public:
     void setValue(parameter_type t)
     {
         QBindingStorage *storage = qGetBindingStorage(owner());
-        auto *bd = storage->bindingData(this);
-        // make sure we don't remove the binding if called from the bindingWrapper
-        const bool inWrapper = inBindingWrapper(storage);
-        if (bd && !inWrapper)
-            bd->removeBinding();
+        if (auto *bd = storage->bindingData(this)) {
+            // make sure we don't remove the binding if called from the bindingWrapper
+            if (!inBindingWrapper(storage))
+                bd->removeBinding();
+        }
         this->val = t;
     }
 
@@ -537,20 +537,20 @@ public:
     void removeBindingUnlessInWrapper()
     {
         QBindingStorage *storage = qGetBindingStorage(owner());
-        auto *bd = storage->bindingData(this);
-        // make sure we don't remove the binding if called from the bindingWrapper
-        const bool inWrapper = inBindingWrapper(storage);
-        if (bd && !inWrapper)
-            bd->removeBinding();
+        if (auto *bd = storage->bindingData(this)) {
+            // make sure we don't remove the binding if called from the bindingWrapper
+            if (!inBindingWrapper(storage))
+                bd->removeBinding();
+        }
     }
 
     void notify()
     {
         QBindingStorage *storage = qGetBindingStorage(owner());
-        auto bd = storage->bindingData(this, false);
-        const bool inWrapper = inBindingWrapper(storage);
-        if (bd && !inWrapper)
-            notify(bd);
+        if (auto bd = storage->bindingData(this, false)) {
+            if (!inBindingWrapper(storage))
+                notify(bd);
+        }
         if constexpr (!std::is_null_pointer_v<decltype(Signal)>) {
             if constexpr (SignalTakesValue::value)
                 (owner()->*Signal)(value());