diff --git a/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs b/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
index 74ad46048..2c658ccb2 100644
--- a/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
+++ b/src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
@@ -203,15 +203,14 @@ namespace Artemis.Core
         /// <summary>
         ///     Overrides the property value with the default value
         /// </summary>
-        public void ApplyDefaultValue()
+        public void ApplyDefaultValue(TimeSpan? time)
         {
             if (_disposed)
                 throw new ObjectDisposedException("LayerProperty");
 
             string json = JsonConvert.SerializeObject(DefaultValue, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All });
-            
-            BaseValue = JsonConvert.DeserializeObject<T>(json);
-            CurrentValue = JsonConvert.DeserializeObject<T>(json);
+
+            SetCurrentValue(JsonConvert.DeserializeObject<T>(json), time);
         }
 
         private void ReapplyUpdate()
@@ -508,7 +507,7 @@ namespace Artemis.Core
                 throw new ArtemisCoreException("Layer property is not yet initialized");
 
             if (!IsLoadedFromStorage)
-                ApplyDefaultValue();
+                ApplyDefaultValue(null);
             else
                 try
                 {
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs
index bde10777a..e6c2ec2c4 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs
@@ -51,7 +51,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
 
         public void ResetToDefault()
         {
-            LayerProperty.ApplyDefaultValue();
+            LayerProperty.ApplyDefaultValue(_profileEditorService.CurrentTime);
             _profileEditorService.UpdateSelectedProfileElement();
         }