diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateClipInspector.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateClipInspector.cs
index 8e2d57dae..b74e69e1b 100644
--- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateClipInspector.cs
+++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateClipInspector.cs
@@ -97,14 +97,12 @@ namespace Spine.Unity.Editor {
 		}
 
 		protected TimelineClip FindTimelineClip (SpineAnimationStateClip targetClip) {
-			string[] guids = AssetDatabase.FindAssets("t:TimelineAsset");
-			foreach (string guid in guids) {
-				TimelineAsset timeline = (TimelineAsset)AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(guid), typeof(TimelineAsset));
-				foreach (TrackAsset track in timeline.GetOutputTracks()) {
-					foreach (TimelineClip clip in track.GetClips()) {
-						if (clip.asset.GetType() == typeof(SpineAnimationStateClip) && object.ReferenceEquals(clip.asset, targetClip)) {
-							return clip;
-						}
+			string assetPath = AssetDatabase.GetAssetPath(targetClip);
+			TimelineAsset timeline = AssetDatabase.LoadAssetAtPath<TimelineAsset>(assetPath);
+			foreach (TrackAsset track in timeline.GetOutputTracks()) {
+				foreach (TimelineClip clip in track.GetClips()) {
+					if (clip.asset.GetType() == typeof(SpineAnimationStateClip) && object.ReferenceEquals(clip.asset, targetClip)) {
+						return clip;
 					}
 				}
 			}
diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json
index f71088b7b..6f29ca439 100644
--- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json
+++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json
@@ -2,7 +2,7 @@
 	"name": "com.esotericsoftware.spine.timeline",
 	"displayName": "Spine Timeline Extensions",
 	"description": "This plugin provides integration of spine-unity for the Unity Timeline.\n\nPrerequisites:\nIt requires a working installation of the spine-unity and spine-csharp runtimes as UPM packages (not as spine-unity unitypackage), version 4.3.20 or newer.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)",
-	"version": "4.3.20",
+	"version": "4.3.21",
 	"unity": "2018.3",
 	"author": {
 		"name": "Esoteric Software",