diff --git a/CHANGELOG.md b/CHANGELOG.md
index 338cde8d5..576ffb6c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
 - Drawing points and shape paths highlighting did not respect UI scale factor
 - [#2416] FLA export - shape fixing in some cases
 - [#2394] FLA export - shape tweens in some cases
+- Not reseting timeline after shape tag type conversion
 
 ## [22.0.2] - 2025-01-17
 ### Added
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/converters/ShapeTypeConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/converters/ShapeTypeConverter.java
index f1df60290..bfbab1638 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/converters/ShapeTypeConverter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/converters/ShapeTypeConverter.java
@@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.tags.DefineShape4Tag;
 import com.jpexs.decompiler.flash.tags.DefineShapeTag;
 import com.jpexs.decompiler.flash.tags.base.CharacterTag;
 import com.jpexs.decompiler.flash.tags.base.ShapeTag;
+import com.jpexs.decompiler.flash.timeline.Timelined;
 import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD;
 import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord;
 import com.jpexs.helpers.Helper;
@@ -92,14 +93,16 @@ public class ShapeTypeConverter {
         if (targetShapeNum == sh.getShapeNum()) {
             return;
         }
+        Timelined tim = sh.getTimelined();
         ShapeTag converted = convertTagType(sh, swf, targetShapeNum);
         converted.setCharacterId(characterId);
         swf.replaceTag(ct, converted);
-        converted.setTimelined(swf);
+        converted.setTimelined(tim);
         swf.updateCharacters();
         swf.clearShapeCache();
         swf.assignClassesToSymbols();
         swf.assignExportNamesToSymbols();
+        tim.resetTimeline();
     }
     
     /**