diff --git a/client/Messages.cs b/client/Messages.cs
index 15e2ddf..adf2517 100644
--- a/client/Messages.cs
+++ b/client/Messages.cs
@@ -27,6 +27,8 @@ internal class Messages : IDisposable {
         this.Plugin.ClientState.Logout -= this.RemoveVfx;
         this.Plugin.ClientState.Login -= this.SpawnVfx;
         this.Plugin.Framework.Update -= this.HandleSpawnQueue;
+
+        this.RemoveVfx(null, null);
     }
 
     private unsafe void HandleSpawnQueue(Framework framework) {
diff --git a/client/Plugin.cs b/client/Plugin.cs
index afd1b07..1eaf6a2 100644
--- a/client/Plugin.cs
+++ b/client/Plugin.cs
@@ -41,6 +41,7 @@ public class Plugin : IDalamudPlugin {
     public void Dispose() {
         this.Messages.Dispose();
         this.Ui.Dispose();
+        this.Vfx.Dispose();
     }
 
     internal void SaveConfig() {