diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp
index b4be946dc3..21f25d8e3d 100644
--- a/src/quick/util/qquickstategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -96,8 +96,10 @@ QQuickStateGroup::QQuickStateGroup(QObject *parent)
 QQuickStateGroup::~QQuickStateGroup()
 {
     Q_D(const QQuickStateGroup);
-    for (int i = 0; i < d->states.size(); ++i)
-        d->states.at(i)->setStateGroup(nullptr);
+    for (int i = 0; i < d->states.size(); ++i) {
+        if (d->states.at(i))
+            d->states.at(i)->setStateGroup(nullptr);
+    }
     if (d->nullState)
         d->nullState->setStateGroup(nullptr);
 }
@@ -143,11 +145,9 @@ QQmlListProperty<QQuickState> QQuickStateGroup::statesProperty()
 void QQuickStateGroupPrivate::append_state(QQmlListProperty<QQuickState> *list, QQuickState *state)
 {
     QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
-    if (state) {
-        _this->d_func()->states.append(state);
+    _this->d_func()->states.append(state);
+    if (state)
         state->setStateGroup(_this);
-    }
-
 }
 
 qsizetype QQuickStateGroupPrivate::count_state(QQmlListProperty<QQuickState> *list)
@@ -167,7 +167,8 @@ void QQuickStateGroupPrivate::clear_states(QQmlListProperty<QQuickState> *list)
     QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     _this->d_func()->setCurrentStateInternal(QString(), true);
     for (qsizetype i = 0; i < _this->d_func()->states.size(); ++i) {
-        _this->d_func()->states.at(i)->setStateGroup(nullptr);
+        if (_this->d_func()->states.at(i))
+            _this->d_func()->states.at(i)->setStateGroup(nullptr);
     }
     _this->d_func()->states.clear();
 }
@@ -178,10 +179,11 @@ void QQuickStateGroupPrivate::replace_states(QQmlListProperty<QQuickState> *list
     auto *d = self->d_func();
     auto *oldState = d->states.at(index);
     if (oldState != state) {
-        oldState->setStateGroup(nullptr);
+        if (oldState)
+            oldState->setStateGroup(nullptr);
         state->setStateGroup(self);
         d->states.replace(index, state);
-        if (d->currentState == oldState->name())
+        if (!oldState || d->currentState == oldState->name())
             d->setCurrentStateInternal(state->name(), true);
     }
 }
diff --git a/tests/auto/qml/qqmllistreference/data/listIgnoresNull.qml b/tests/auto/qml/qqmllistreference/data/listIgnoresNull.qml
index 6815edb916..35c8d66dad 100644
--- a/tests/auto/qml/qqmllistreference/data/listIgnoresNull.qml
+++ b/tests/auto/qml/qqmllistreference/data/listIgnoresNull.qml
@@ -1,12 +1,21 @@
-import QtQml
+import QtQuick 2.7
 import Test
 
-TestItem {
-    id: testItem
+Item {
+    id: root
+
+    TestItem {
+        id: testItem
+    }
 
     Component.onCompleted : {
         testItem.data.push(null);
         testItem.data.length = 5;
         testItem.data.unshift(null);
+
+        var state = Qt.createQmlObject( "import QtQuick 2.7; State{ name: 'MyState' }", root, "dynamicState" );
+        root.states.length = 5;
+        root.states.push(null);
+        root.states.unshift(state);
     }
 }