diff --git a/server/tag.go b/server/tag.go
index 19c123daf..f8ac6e0d4 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(`#([^\s]+?) `)
+		r := regexp.MustCompile(`#([^\s#]+?) `)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to compile regexp").SetInternal(err)
 		}
diff --git a/web/src/helpers/consts.ts b/web/src/helpers/consts.ts
index 2af38a037..c72be8199 100644
--- a/web/src/helpers/consts.ts
+++ b/web/src/helpers/consts.ts
@@ -11,7 +11,7 @@ export const TOAST_ANIMATION_DURATION = 400;
 export const DAILY_TIMESTAMP = 3600 * 24 * 1000;
 
 // tag regex
-export const TAG_REG = /#(\S+?) /g;
+export const TAG_REG = /#([^\s#]+?) /g;
 
 // markdown image regex
 export const IMAGE_URL_REG = /!\[.*?\]\((.+?)\)/g;