diff --git a/FFXIV_Vibe_Plugin/App/Devices/DevicesController.cs b/FFXIV_Vibe_Plugin/App/Devices/DevicesController.cs
index c161669..2e5bcc8 100644
--- a/FFXIV_Vibe_Plugin/App/Devices/DevicesController.cs
+++ b/FFXIV_Vibe_Plugin/App/Devices/DevicesController.cs
@@ -353,6 +353,9 @@ namespace FFXIV_Vibe_Plugin.Device {
           forceStop = true;
           this.SendCommand(command, device, 0, motorId);
           this.Logger.Debug($"Force stopping {deviceAndMotorId} because of StopAfter={StopAfter}");
+
+          // Make sure we clean the current playing trigger whgenever we're force stopping a trigger
+          this.CurrentPlayingTrigger = null;
         }
       });
       tStopAfter.Start();
@@ -394,9 +397,6 @@ namespace FFXIV_Vibe_Plugin.Device {
 
           Thread.Sleep(duration);
         }
-
-        // Make sure we clean the current playing trigger.
-        this.CurrentPlayingTrigger = null;
       });
       t.Start();
     }