diff --git a/server/tag.go b/server/tag.go
index f6226da3..19c123da 100644
--- a/server/tag.go
+++ b/server/tag.go
@@ -47,7 +47,7 @@ func (s *Server) registerTagRoutes(g *echo.Group) {
 
 		tagMapSet := make(map[string]bool)
 
-		r := regexp.MustCompile("#(.+?) ")
+		r := regexp.MustCompile(`#([^\s]+?) `)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to compile regexp").SetInternal(err)
 		}