diff --git a/server.go b/server.go
index 01304a1..3ab35b4 100644
--- a/server.go
+++ b/server.go
@@ -152,6 +152,10 @@ func (ms *Server) setupRoutes() {
 	r.GET("/get/latest/merps", tollbooth_gin.LimitHandler(limiter), ms.getLatestMerps())
 	r.GET("/get/merps/for/:thing", tollbooth_gin.LimitHandler(limiter), ms.getLatestMerps())
 
+	r.NoRoute(func(c *gin.Context) {
+		c.JSON(404, gin.H{"message": "not found"})
+	})
+
 	ms.gin = r
 }