diff --git a/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ToggleSwitch_themeresources.xaml b/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ToggleSwitch_themeresources.xaml
index 1d4cba8f5459..cb8ac716e727 100644
--- a/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ToggleSwitch_themeresources.xaml
+++ b/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/ToggleSwitch_themeresources.xaml
@@ -372,6 +372,20 @@
 
                                         <Storyboard>
                                             <RepositionThemeAnimation TargetName="SwitchKnob" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}" />
+                                            <!--#region uno#9507: UNO specific workaround to reset the states -->
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <!--#endregion-->
                                         </Storyboard>
                                     </VisualTransition>
                                     <VisualTransition x:Name="OffToOnTransition"
diff --git a/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml b/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml
index a6f6213940e5..b9fb9aab4afd 100644
--- a/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml
+++ b/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml
@@ -19816,6 +19816,20 @@
                   <VisualTransition x:Name="OnToOffTransition" From="On" To="Off" GeneratedDuration="0">
                     <Storyboard>
                       <RepositionThemeAnimation TargetName="SwitchKnob" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}" />
+                      <!--#region uno#9507: UNO specific workaround to reset the states -->
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="0" Value="0" />
+                      </DoubleAnimationUsingKeyFrames>
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="0" Value="1" />
+                      </DoubleAnimationUsingKeyFrames>
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="0" Value="0" />
+                      </DoubleAnimationUsingKeyFrames>
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="0" Value="1" />
+                      </DoubleAnimationUsingKeyFrames>
+                      <!--#endregion-->
                     </Storyboard>
                   </VisualTransition>
                   <VisualTransition x:Name="OffToOnTransition" From="Off" To="On" GeneratedDuration="0">
diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ToggleSwitch_themeresources.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ToggleSwitch_themeresources.xaml
index a5b48addab30..a5ebfc867881 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ToggleSwitch_themeresources.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ToggleSwitch_themeresources.xaml
@@ -461,6 +461,20 @@
 
                                         <Storyboard>
                                             <RepositionThemeAnimation TargetName="SwitchKnob" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}" />
+                                            <!--#region uno#9507: UNO specific workaround to reset the states -->
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <!--#endregion-->
                                         </Storyboard>
                                     </VisualTransition>
                                     <VisualTransition x:Name="OffToOnTransition"
diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
index 7218312f5b42..0547cafcf248 100644
--- a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
+++ b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -23085,6 +23085,20 @@
                   <VisualTransition x:Name="OnToOffTransition" From="On" To="Off" GeneratedDuration="0">
                     <Storyboard>
                       <RepositionThemeAnimation TargetName="SwitchKnob" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}" />
+                      <!--#region uno#9507: UNO specific workaround to reset the states -->
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+                      </DoubleAnimationUsingKeyFrames>
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+                      </DoubleAnimationUsingKeyFrames>
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+                      </DoubleAnimationUsingKeyFrames>
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+                      </DoubleAnimationUsingKeyFrames>
+                      <!--#endregion-->
                     </Storyboard>
                   </VisualTransition>
                   <VisualTransition x:Name="OffToOnTransition" From="Off" To="On" GeneratedDuration="0">