diff --git a/PCK-Studio/Extensions/AnimationExtensions.cs b/PCK-Studio/Extensions/AnimationExtensions.cs
index 557e8e45..9c6e2b8d 100644
--- a/PCK-Studio/Extensions/AnimationExtensions.cs
+++ b/PCK-Studio/Extensions/AnimationExtensions.cs
@@ -15,6 +15,10 @@ namespace PckStudio.Extensions
     {
         internal static Image CreateAnimationImage(this Animation animation)
         {
+            if (animation.FrameCount  == 0)
+            {
+                return null;
+            }
             var ms = new System.IO.MemoryStream();
             var generateor = new AnimatedGifCreator(ms, Animation.GameTickInMilliseconds, 0);
             foreach (var frame in animation.GetInterpolatedFrames())
diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.cs b/PCK-Studio/Forms/Editor/AnimationEditor.cs
index f96da2bd..da56968e 100644
--- a/PCK-Studio/Forms/Editor/AnimationEditor.cs
+++ b/PCK-Studio/Forms/Editor/AnimationEditor.cs
@@ -94,6 +94,8 @@ namespace PckStudio.Forms.Editor
             TextureIcons.Images.AddRange(_animation.GetTextures().ToArray());
             UpdateTreeView();
 
+			animationPictureBox.Image ??= _animation.CreateAnimationImage();
+
             if (_animation.FrameCount > 0)
             {
 				animationPictureBox.Image.SelectActiveFrame(FrameDimension.Page, 0);