diff --git a/WeakAuras/BuffTrigger2.lua b/WeakAuras/BuffTrigger2.lua
index c5060fe..99310a6 100644
--- a/WeakAuras/BuffTrigger2.lua
+++ b/WeakAuras/BuffTrigger2.lua
@@ -696,6 +696,11 @@ local function UpdateStateWithNoMatch(time, triggerStates, triggerInfo, cloneId,
       changed = true
     end
 
+    if state.tooltip or state.tooltip1 or state.tooltip2 or state.tooltip3 then
+      state.tooltip, state.tooltip1, state.tooltip2, state.tooltip3 = nil, nil, nil, nil
+      changed = true
+    end
+
     if state.matchCount ~= matchCount then
       state.matchCount = matchCount
       changed = true
diff --git a/WeakAuras/History.lua b/WeakAuras/History.lua
index 07356b0..3c13c5f 100644
--- a/WeakAuras/History.lua
+++ b/WeakAuras/History.lua
@@ -73,4 +73,3 @@ end
 function WeakAuras.GetMigrationSnapshot(uid)
   return loadMigrations():GetData(uid)
 end
-
diff --git a/WeakAuras/Init.lua b/WeakAuras/Init.lua
index e6ca5bf..353bdeb 100644
--- a/WeakAuras/Init.lua
+++ b/WeakAuras/Init.lua
@@ -7,8 +7,8 @@ WeakAuras.halfWidth = WeakAuras.normalWidth / 2
 WeakAuras.doubleWidth = WeakAuras.normalWidth * 2
 
 local versionStringFromToc = GetAddOnMetadata("WeakAuras", "Version")
-local versionString = "2.17.12"
-local buildTime = "20200511190745"
+local versionString = "2.18.0"
+local buildTime = "20200802154726"
 
 WeakAuras.versionString = versionStringFromToc
 WeakAuras.buildTime = buildTime
diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc
index 602c320..61e222f 100644
--- a/WeakAuras/WeakAuras.toc
+++ b/WeakAuras/WeakAuras.toc
@@ -1,7 +1,7 @@
 ## Interface: 30300
 ## Title: WeakAuras 2
 ## Author: Mirrored and the WeakAuras Team
-## Version: 2.17.12
+## Version: 2.18.0
 ## Notes: A powerful, comprehensive utility for displaying graphics and information based on buffs, debuffs, and other triggers.
 ## Notes-esES: Potente y completa aplicación que te permitirá mostrar por pantalla múltiples diseños, basados en beneficios, perjuicios y otros activadores.
 ## Notes-deDE: Ein leistungsfähiges, umfassendes Addon zur grafischen Darstellung von Informationen von Auren, Cooldowns, Timern und vielem mehr.