diff --git a/Editor/Scripts/Features/ImageFolderPlayableAssetEditor.cs b/Editor/Scripts/Features/ImageFolderPlayableAssetEditor.cs
index 345269f3..57858e7e 100644
--- a/Editor/Scripts/Features/ImageFolderPlayableAssetEditor.cs
+++ b/Editor/Scripts/Features/ImageFolderPlayableAssetEditor.cs
@@ -1,4 +1,5 @@
 using Unity.FilmInternalUtilities;
+using UnityEditor;
 using UnityEditor.Timeline;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -14,7 +15,11 @@ public override void OnClipChanged(TimelineClip clip) {
                         
         ImageFolderPlayableAsset<T> imageFolderPlayableAsset = clip.asset as ImageFolderPlayableAsset<T>;
         Assert.IsNotNull(imageFolderPlayableAsset);
-        imageFolderPlayableAsset.RefreshPlayableFrames();            
+
+        //Use delayCall to prevent marker creation during undo/redo process
+        EditorApplication.delayCall += () => {
+            imageFolderPlayableAsset.RefreshPlayableFrames();
+        };
     }
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/Tests/Editor/Scripts/FrameMarkerTest.cs b/Tests/Editor/Scripts/FrameMarkerTest.cs
index 2c07e26c..deba4c60 100644
--- a/Tests/Editor/Scripts/FrameMarkerTest.cs
+++ b/Tests/Editor/Scripts/FrameMarkerTest.cs
@@ -16,39 +16,35 @@ internal class FrameMarkerTest {
     [UnityTest]
     public IEnumerator ShowFrameMarkers() {
         
-        //[Note-sin: 2022-12-21] Disabling test in Unity 2022 because this error "Assertion failed on expression: '!GetUndoManager().IsProcessing()'"
-        //The flow when this occurs:
-        //1. calling Undo.PerformUndo(); triggers ImageFolderPlayableAssetEditor.OnClipChanged()
-        //2. ImageFolderPlayableAssetEditor.OnClipChanged() may call TrackAsset.CreateMarker()  
-        //3. TrackAsset.CreateMarker() has Undo-related calls in it, which seems to be incompatible if it is called during an undo process        
-#if !UNITY_2022_2_OR_NEWER
         PlayableDirector director = EditorUtilityTest.NewSceneWithDirector();
         TimelineClip                        clip     = EditorUtilityTest.CreateTestSISTimelineClip(director);
         StreamingImageSequencePlayableAsset sisAsset = clip.asset as StreamingImageSequencePlayableAsset;
         Assert.IsNotNull(sisAsset);
-        yield return null;
+        yield return YieldEditorUtility.WaitForFramesAndIncrementUndo(1);
         
         //Show
         SISClipData clipData = sisAsset.GetBoundClipData();
+        Assert.IsNotNull(clipData);
         
         TrackAsset trackAsset = clip.GetParentTrack();
         clipData.RequestFrameMarkers(true, true);
         TimelineEditor.Refresh(RefreshReason.ContentsModified);
-        yield return null;
+        yield return YieldEditorUtility.WaitForFramesAndIncrementUndo(1);
         
         Assert.AreEqual(TimelineUtility.CalculateNumFrames(clip), trackAsset.GetMarkerCount());
-        yield return null;
+        yield return YieldEditorUtility.WaitForFramesAndIncrementUndo(1);
 
 
         //Undo showing FrameMarkers
-        EditorUtilityTest.UndoAndRefreshTimelineEditor(); yield return null;
+        EditorUtilityTest.UndoAndRefreshTimelineEditor();
+        yield return YieldEditorUtility.WaitForFramesAndIncrementUndo(1);
+        
         Assert.False(clipData.AreFrameMarkersRequested());
         Assert.AreEqual(0, trackAsset.GetMarkerCount());
         
         
         EditorUtilityTest.DestroyTestTimelineAssets(clip);
-#endif
-        yield return null;
+        yield return YieldEditorUtility.WaitForFramesAndIncrementUndo(1);
     }