diff --git a/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp b/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp
index 2a2c529d6c3..3c9ddee2af2 100644
--- a/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp
@@ -117,8 +117,8 @@ QmlModelState QmlObjectNode::currentState(SL sl) const
                                keyValue("model node", *this),
                                keyValue("caller location", sl)};
 
-    if (isValid())
-        return QmlModelState(view()->currentStateNode());
+    if (auto view = this->view())
+        return QmlModelState(view->currentStateNode());
     else
         return QmlModelState();
 }
@@ -193,11 +193,7 @@ bool QmlObjectNode::hasBindingProperty(PropertyNameView name, SL sl) const
                                keyValue("model node", *this),
                                keyValue("caller location", sl)};
 
-    if (!isValid())
-        return false;
-
-    if (currentState().hasPropertyChanges(modelNode())) {
-        QmlPropertyChanges propertyChanges = currentState().propertyChanges(modelNode());
+    if (QmlPropertyChanges propertyChanges = currentState().propertyChanges(modelNode())) {
         if (propertyChanges.modelNode().hasBindingProperty(name))
             return true;
     }
diff --git a/src/plugins/qmldesigner/qmltools/qmlstate.cpp b/src/plugins/qmldesigner/qmltools/qmlstate.cpp
index 32648830c17..cd2dbc61d9e 100644
--- a/src/plugins/qmldesigner/qmltools/qmlstate.cpp
+++ b/src/plugins/qmldesigner/qmltools/qmlstate.cpp
@@ -172,9 +172,6 @@ QList<QmlModelStateOperation> QmlModelState::allInvalidStateOperations(SL sl) co
 
 void QmlModelState::addChangeSetIfNotExists(const ModelNode &node)
 {
-    if (!isValid())
-        return;
-
     if (!hasPropertyChanges(node)) {
         ModelNode newChangeSet;