diff --git a/1080i/Timers.xml b/1080i/Timers.xml
index 1a7cd5c5..cd43552a 100644
--- a/1080i/Timers.xml
+++ b/1080i/Timers.xml
@@ -9,8 +9,6 @@
         <onstart>SetProperty(AutoTrailer,$ESCINFO[Container(99950).ListItem.Trailer],Home)</onstart>
         <onstart>SetProperty(AutoTrailerTitle,$ESCINFO[Container(99950).ListItem.Title],Home)</onstart>
         <onstop condition="Player.HasVideo + String.IsEqual(Window(Home).Property(PlayTrailer),Player.FileNameAndPath)">Action(Stop)</onstop>
-        <onstop condition="Player.HasVideo + String.IsEqual(Window(Home).Property(PlayTrailer),Player.FileNameAndPath)">ClearProperty(PlayTrailer,Home)</onstop>
-        <onstop condition="Player.HasVideo + String.IsEqual(Window(Home).Property(PlayTrailer),Player.FileNameAndPath)">ClearProperty(PlayTrailerTitle,Home)</onstop>
         <onstop>ClearProperty(AutoTrailer,Home)</onstop>
         <onstop>ClearProperty(AutoTrailerTitle,Home)</onstop>
     </timer>
@@ -19,9 +17,9 @@
         <name>play_spotlight_trailer</name>
         <start reset="true">!Player.HasVideo + [[Integer.IsGreater(Skin.TimerElapsedSecs(idle_spotlight_trailer),3) + System.IdleTime(3)] | [Integer.IsGreater(Skin.TimerElapsedSecs(idle_spotlight_trailer),1) + Skin.HasSetting(Trailers.EnableAutoPlayback.Info) + Window.IsVisible(DialogVideoInfo.xml)]]</start>
         <stop>![!Player.HasVideo + [[Integer.IsGreater(Skin.TimerElapsedSecs(idle_spotlight_trailer),3) + System.IdleTime(3)] | [Integer.IsGreater(Skin.TimerElapsedSecs(idle_spotlight_trailer),1) + Skin.HasSetting(Trailers.EnableAutoPlayback.Info) + Window.IsVisible(DialogVideoInfo.xml)]]]</stop>
-        <onstart condition="!String.IsEmpty(Container(99950).ListItem.Trailer)">SetProperty(PlayTrailerTitle,$ESCINFO[Container(99950).ListItem.Title],Home)</onstart>
-        <onstart condition="!String.IsEmpty(Container(99950).ListItem.Trailer)">SetProperty(PlayTrailer,$ESCINFO[Container(99950).ListItem.Trailer],Home)</onstart>
-        <onstart condition="!String.IsEmpty(Container(99950).ListItem.Trailer)">SetProperty(Trailer,$ESCINFO[Container(99950).ListItem.Trailer],1123)</onstart>
-        <onstart condition="!String.IsEmpty(Container(99950).ListItem.Trailer)">PlayMedia($ESCINFO[Container(99950).ListItem.Trailer],1)</onstart>
+        <onstart condition="!String.IsEmpty(Container(99950).ListItem.Trailer) + !String.IsEqual(Window(Home).Property(PlayTrailer),Container(99950).ListItem.Trailer)">SetProperty(PlayTrailerTitle,$ESCINFO[Container(99950).ListItem.Title],Home)</onstart>
+        <onstart condition="!String.IsEmpty(Container(99950).ListItem.Trailer) + !String.IsEqual(Window(Home).Property(PlayTrailer),Container(99950).ListItem.Trailer)">SetProperty(PlayTrailer,$ESCINFO[Container(99950).ListItem.Trailer],Home)</onstart>
+        <onstart condition="!String.IsEmpty(Container(99950).ListItem.Trailer) + !String.IsEqual(Window(Home).Property(PlayTrailer),Container(99950).ListItem.Trailer)">SetProperty(Trailer,$ESCINFO[Container(99950).ListItem.Trailer],1123)</onstart>
+        <onstart condition="!String.IsEmpty(Container(99950).ListItem.Trailer) + !String.IsEqual(Window(Home).Property(PlayTrailer),Container(99950).ListItem.Trailer)">PlayMedia($ESCINFO[Container(99950).ListItem.Trailer],1)</onstart>
     </timer>
 </timers>