diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue
index 82d28f30e..f2c625a55 100644
--- a/src/client/components/post-form.vue
+++ b/src/client/components/post-form.vue
@@ -615,7 +615,7 @@ export default defineComponent({
 				viaMobile: isMobile
 			};
 
-			if (this.withHashtags) {
+			if (this.withHashtags && this.hashtags && this.hashtags.trim() !== '') {
 				const hashtags = this.hashtags.trim().split(' ').map(x => x.startsWith('#') ? x : '#' + x).join(' ');
 				data.text = data.text ? `${data.text} ${hashtags}` : hashtags;
 			}