diff --git a/Modules/Quest/QuestieQuest.lua b/Modules/Quest/QuestieQuest.lua
index fba6ae7..6272781 100644
--- a/Modules/Quest/QuestieQuest.lua
+++ b/Modules/Quest/QuestieQuest.lua
@@ -1673,6 +1673,20 @@ _RegisterObjectiveTooltips = function(objective, questId, blockItemTooltips)
                 objective.registeredItemTooltips = true
             end
             return
+        elseif objective.Type == "killcredit" then
+            local ids = objective.IdList
+            if type(ids) ~= "table" then
+                ids = { objective.Id }
+            end
+
+            for _, id in ipairs(ids) do
+                if id then
+                    QuestieTooltips:RegisterObjectiveTooltip(questId, "m_" .. id, objective)
+                end
+            end
+
+            objective.hasRegisteredTooltips = true
+            return
         end
 
         Questie:Error("[QuestieQuest]: [Tooltips] " ..
diff --git a/Tests/QuestieQuestTooltipFallback_spec.lua b/Tests/QuestieQuestTooltipFallback_spec.lua
index af94b07..13901ec 100644
--- a/Tests/QuestieQuestTooltipFallback_spec.lua
+++ b/Tests/QuestieQuestTooltipFallback_spec.lua
@@ -16,6 +16,8 @@ describe("QuestieQuest tooltip fallback", function()
         assert.is_true(has(questieQuest, 'tooltipKey = "m_" .. objective.Id'))
         assert.is_true(has(questieQuest, 'tooltipKey = "o_" .. objective.Id'))
         assert.is_true(has(questieQuest, 'tooltipKey = "i_" .. objective.Id'))
+        assert.is_true(has(questieQuest, 'elseif objective.Type == "killcredit" then'))
+        assert.is_true(has(questieQuest, 'QuestieTooltips:RegisterObjectiveTooltip(questId, "m_" .. id, objective)'))
         assert.is_true(has(questieQuest, "objective.registeredItemTooltips = true"))
     end)
 end)