diff --git a/src/server/server.ts b/src/server/server.ts
index 49b0e76..45a0a34 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -1,6 +1,6 @@
 import { NextFunction, Router } from 'express'
 import expressBasicAuth from 'express-basic-auth'
-import { body, header, query } from 'express-validator'
+import { body, header, param } from 'express-validator'
 import register from './register'
 import { CreateKillRecord, CheckServerToken } from '../db/db'
 import { validateErrors } from '../common'
@@ -58,6 +58,7 @@ router.post('/:serverId/kill', (req, res, next) => {
 
 router.post(
   '/:serverId/kill',
+  param('serverId').exists().toInt().isInt(),
   body([
     'attacker_current_weapon_mods',
     'attacker_weapon_1_mods',
@@ -149,13 +150,13 @@ router.post(
       cause_of_death,
       distance
     } = req.body
-    if (!req.query.serverId) {
+    if (!req.params.serverId) {
       res.status(500).send('serverId cannot be undefined')
       return
     }
     CreateKillRecord({
       killstat_version,
-      server: Number(req.query.serverId),
+      server: Number(req.params.serverId),
       match_id,
       game_mode,
       map,
@@ -192,7 +193,7 @@ router.post(
         res.sendStatus(201)
         console.log(
           `[${Date.now().toLocaleString()}] Kill submitted for server ${
-            req.query.serverId
+            req.params.serverId
           }, ${attacker_name} killed ${victim_name}`
         )
       })