diff --git a/Guda.toc b/Guda.toc
index c1add05..513b501 100644
--- a/Guda.toc
+++ b/Guda.toc
@@ -2,7 +2,7 @@
 ## Title: Guda
 ## Notes: All-in-one bag and bank addon for Turtle WoW
 ## Author: Vati
-## Version: 1.2.6
+## Version: 1.3.0
 ## SavedVariables: Guda_DB
 ## SavedVariablesPerCharacter: Guda_CharDB
 
diff --git a/UI/TrackedItemBar.lua b/UI/TrackedItemBar.lua
index 672cfb5..5b9ec37 100644
--- a/UI/TrackedItemBar.lua
+++ b/UI/TrackedItemBar.lua
@@ -106,6 +106,7 @@ function TrackedItemBar:Update()
 
         button.hasItem = true
         button.itemData = { link = info.link }
+        button.itemID = info.itemID
         button.isReadOnly = true -- Don't allow regular clicks/interaction like usage? 
         -- Actually user didn't specify usage, but "action bar type" suggests it might be usable.
         -- But "tracked items" usually means materials or currencies.
@@ -121,15 +122,18 @@ function TrackedItemBar:Update()
         button:SetScript("OnClick", function()
             if IsControlKeyDown() then
                 -- Un-track item
-                local trackedIDs = addon.Modules.DB:GetSetting("trackedItems") or {}
-                trackedIDs[info.itemID] = nil
-                addon.Modules.DB:SetSetting("trackedItems", trackedIDs)
-                
-                -- Update everything
-                if Guda.Modules.BagFrame and Guda.Modules.BagFrame.Update then
-                    Guda.Modules.BagFrame:Update()
+                local itemID = this.itemID
+                if itemID then
+                    local trackedIDs = addon.Modules.DB:GetSetting("trackedItems") or {}
+                    trackedIDs[itemID] = nil
+                    addon.Modules.DB:SetSetting("trackedItems", trackedIDs)
+                    
+                    -- Update everything
+                    if Guda.Modules.BagFrame and Guda.Modules.BagFrame.Update then
+                        Guda.Modules.BagFrame:Update()
+                    end
+                    TrackedItemBar:Update()
                 end
-                TrackedItemBar:Update()
             end
         end)