diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index 4413bfa0d..1d9c41129 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -491,6 +491,8 @@ export default {
     // we have to replace our suggestion text with a mention
     // so it's important to pass also the position of your suggestion text
     selectItem(item) {
+      const searchUrl = new URL('/')
+      searchUrl.searchParams.set('hashtag', item.name)
       const typeAttrs = {
         mention: {
           // TODO: use router here
@@ -499,7 +501,7 @@ export default {
         },
         hashtag: {
           // TODO: Fill up with input hashtag in search field
-          url: `/search/hashtag/${item.name}`,
+          url: searchUrl.href,
           label: item.name,
         },
       }
diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue
index 9bfb3ddba..2640cfead 100644
--- a/webapp/components/FilterMenu/FilterMenu.vue
+++ b/webapp/components/FilterMenu/FilterMenu.vue
@@ -49,7 +49,7 @@
 export default {
   props: {
     user: { type: Object, required: true },
-    hashtag: { type: Object, default: null },
+    hashtag: { type: String, default: null },
   },
   data() {
     return {
diff --git a/webapp/pages/search/hashtag/_id.vue b/webapp/pages/search/hashtag/_id.vue
deleted file mode 100644
index d180b4e4f..000000000
--- a/webapp/pages/search/hashtag/_id.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  <div></div>
-</template>
-
-<script>
-export default {
-  mounted() {
-    const { id: hashtag } = this.$route.params
-    this.$router.push({ path: '/', query: { hashtag } })
-  },
-}
-</script>