diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
index bbc4963955a..5eaee4e791e 100644
--- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
+++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
@@ -295,9 +295,11 @@ void TimelineSettingsModel::updateTimeline(int row)
                     propertyChanges.modelNode().variantProperty("enabled").setValue(false);
             }
 
-            QmlPropertyChanges propertyChanges(modelState.propertyChanges(timeline));
-            if (propertyChanges.isValid())
-                propertyChanges.modelNode().variantProperty("enabled").setValue(true);
+            if (timeline.isValid()) { /* If timeline is invalid 'none' was selected */
+                QmlPropertyChanges propertyChanges(modelState.propertyChanges(timeline));
+                if (propertyChanges.isValid())
+                    propertyChanges.modelNode().variantProperty("enabled").setValue(true);
+            }
         }
 
     } catch (Exception &e) {
@@ -345,9 +347,11 @@ void TimelineSettingsModel::updateAnimation(int row)
                 }
             }
 
-            QmlPropertyChanges propertyChanges(modelState.propertyChanges(animation));
-            if (propertyChanges.isValid())
-                propertyChanges.modelNode().variantProperty("running").setValue(true);
+            if (animation.isValid()) { /* If animation is invalid 'none' was selected */
+                QmlPropertyChanges propertyChanges(modelState.propertyChanges(animation));
+                if (propertyChanges.isValid())
+                    propertyChanges.modelNode().variantProperty("running").setValue(true);
+            }
         }
     } catch (Exception &e) {
         m_exceptionError = e.description();