diff --git a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
index be6feef0..de1abef5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
@@ -12,8 +12,6 @@ namespace HandyControl.Controls
 {
     public class AnimationPath : Shape
     {
-        private bool _isLoaded;
-
         /// <summary>
         ///     故事板
         /// </summary>
@@ -126,15 +124,7 @@ namespace HandyControl.Controls
                 OnPropertiesChanged));
         }
 
-        public AnimationPath()
-        {
-            Loaded += (s, e) =>
-            {
-                if (_isLoaded) return;
-                UpdatePath();
-                _isLoaded = true;
-            };
-        }
+        public AnimationPath() => Loaded += (s, e) => UpdatePath();
 
         /// <summary>
         ///     动画完成事件
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
index cf0d398a..214e7556 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
@@ -142,8 +142,11 @@
                         <TextBlock Margin="0,10,0,0" Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}"/>
                     </StackPanel>
                     <ControlTemplate.Triggers>
-                        <EventTrigger RoutedEvent="FrameworkElement.Loaded">
-                            <BeginStoryboard Storyboard="{StaticResource StoryboardOnLoaded}"/>
+                        <EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="PART_Wave">
+                            <BeginStoryboard Name="BeginStoryboardWave" Storyboard="{StaticResource StoryboardOnLoaded}"/>
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="FrameworkElement.Unloaded" SourceName="PART_Wave">
+                            <StopStoryboard BeginStoryboardName="BeginStoryboardWave"/>
                         </EventTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>