diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e599ee..bb06165 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.22.1
+
+- fix bug :)
+
 # 0.22.0
 
 - add capability to clear data for guild
diff --git a/CalamityEPGP/CalamityEPGP.toc b/CalamityEPGP/CalamityEPGP.toc
index 1a36d9e..1dcc1fc 100644
--- a/CalamityEPGP/CalamityEPGP.toc
+++ b/CalamityEPGP/CalamityEPGP.toc
@@ -1,7 +1,7 @@
 ## Title: CalamityEPGP
 ## Notes: EPGP addon for Cataclysm Classic
 ## Author: Kardiir-Atiesh
-## Version: 0.22.0
+## Version: 0.22.1
 ## Interface: 40400
 ## SavedVariables: CalamityEPGP
 ## DefaultState: enabled
diff --git a/CalamityEPGP/sync.lua b/CalamityEPGP/sync.lua
index 4bca1bd..77f4a3d 100644
--- a/CalamityEPGP/sync.lua
+++ b/CalamityEPGP/sync.lua
@@ -237,7 +237,7 @@ function Sync:getEvents(timeframe, timestamps)
         for timeframeTs in timestamps:iter() do
             local index = timeframeTsIndex:get(timeframeTs)
 
-            -- if index ~= nil then
+            if index ~= nil and ns.db.history ~= nil then
                 local i = index
                 while true do
                     if i > #ns.db.history then
@@ -257,7 +257,7 @@ function Sync:getEvents(timeframe, timestamps)
 
                     i = i + 1
                 end
-            -- end
+            end
         end
     end