diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue
index 5efa1eacc..aaec36ed3 100644
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -382,9 +382,8 @@ export default Vue.extend({
 
 			if (this.text && this.text != '') {
 				const hashtags = parse(this.text).filter(x => x.type == 'hashtag').map(x => x.hashtag);
-				let history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
-				history = history.filter(x => !hashtags.includes(x));
-				localStorage.setItem('hashtags', JSON.stringify(hashtags.concat(history)));
+				const history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
+				localStorage.setItem('hashtags', JSON.stringify(hashtags.concat(history).reduce((a, c) => a.includes(c) ? a : [...a, c], [])));
 			}
 		},
 
diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue
index 05e8b0986..b04a1968d 100644
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@@ -295,9 +295,8 @@ export default Vue.extend({
 
 			if (this.text && this.text != '') {
 				const hashtags = parse(this.text).filter(x => x.type == 'hashtag').map(x => x.hashtag);
-				let history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
-				history = history.filter(x => !hashtags.includes(x));
-				localStorage.setItem('hashtags', JSON.stringify(hashtags.concat(history)));
+				const history = JSON.parse(localStorage.getItem('hashtags') || '[]') as string[];
+				localStorage.setItem('hashtags', JSON.stringify(hashtags.concat(history).reduce((a, c) => a.includes(c) ? a : [...a, c], [])));
 			}
 		},