diff --git a/tgui/packages/tgui/interfaces/TicketListPanel.js b/tgui/packages/tgui/interfaces/TicketListPanel.js
index f4b933de5c32..770cc556c803 100644
--- a/tgui/packages/tgui/interfaces/TicketListPanel.js
+++ b/tgui/packages/tgui/interfaces/TicketListPanel.js
@@ -173,7 +173,7 @@ export const TicketSummary = (props, context) => {
@@ -190,7 +190,7 @@ export const TicketSummary = (props, context) => {
disabled={button.disabled}
selected={button.selected}
onClick={(val => () => act(val, {
- 'id': ticket.id,
+ 'index': ticket.index,
}))(button.act)}>
{button.name}
diff --git a/yogstation/code/modules/admin/verbs/ticketpanel.dm b/yogstation/code/modules/admin/verbs/ticketpanel.dm
index bce00360671c..4987959ad56a 100644
--- a/yogstation/code/modules/admin/verbs/ticketpanel.dm
+++ b/yogstation/code/modules/admin/verbs/ticketpanel.dm
@@ -15,10 +15,14 @@ GLOBAL_VAR_INIT(experimental_adminpanel, TRUE)
.["resolved_tickets"] = list()
.["user_key"] = user.key
- for(var/datum/admin_help/ahelp as anything in GLOB.ahelp_tickets.tickets_list)
+ for(var/i in 1 to tickets_list.len)
+ var/datum/admin_help/ahelp = tickets_list[i]
+ if(!istype(ahelp)) return
+
var/ticket_data = list()
ticket_data["name"] = ahelp.name
ticket_data["id"] = ahelp.id
+ ticket_data["index"] = i
ticket_data["initiator_key_name"] = ahelp.initiator_key_name
ticket_data["initiator_ckey"] = ahelp.initiator_ckey
ticket_data["admin_key"] = ahelp.handling_admin && ahelp.handling_admin.key
@@ -36,7 +40,7 @@ GLOBAL_VAR_INIT(experimental_adminpanel, TRUE)
. = ..()
if(.)
return
- var/datum/admin_help/ticket = tickets_list[params["id"]]
+ var/datum/admin_help/ticket = tickets_list[params["index"]]
if(!ticket)
return FALSE