diff --git a/pkg/app/tag_routes.go b/pkg/app/tag_routes.go
index 73f3598..969b166 100644
--- a/pkg/app/tag_routes.go
+++ b/pkg/app/tag_routes.go
@@ -10,11 +10,14 @@ import (
 )
 
 func InitializeTagRoutes(g *gin.Engine) {
+	autocomplete := g.Group("/api/tag-autocomplete")
+	{
+		autocomplete.GET("/", tagAutocomplete)
+	}
 	unprotected := g.Group("/api/tag")
 	{
 		unprotected.GET("/", tagGet)
 		unprotected.GET("/:tag", tagGetOne)
-		unprotected.GET("/autocomplete", tagAutocomplete)
 	}
 	protected := g.Group("/api/tag").Use(middleware.AuthMiddleware())
 	{
@@ -36,6 +39,7 @@ func tagGetOne(c *gin.Context) {
 			Code:    http.StatusBadRequest,
 			Message: err.Error(),
 		})
+		c.Abort()
 	}
 
 	c.JSON(http.StatusOK, models.TagReadModel{
diff --git a/web/app/src/api.js b/web/app/src/api.js
index 1d32040..b9bdd4d 100644
--- a/web/app/src/api.js
+++ b/web/app/src/api.js
@@ -49,7 +49,7 @@ export async function getTag({ tag }) {
 }
 
 export async function getTagAutocomplete() {
-    const endpoint = url + "/api/tag/autocomplete";
+    const endpoint = url + "/api/tag-autocomplete";
     const response = await axios.get(endpoint);
     return response.data;
 }