diff --git a/src/client/app/common/scripts/should-mute-note.ts b/src/client/app/common/scripts/should-mute-note.ts
index 65d25d17c..08d7f24a7 100644
--- a/src/client/app/common/scripts/should-mute-note.ts
+++ b/src/client/app/common/scripts/should-mute-note.ts
@@ -20,7 +20,7 @@ export default function(me, settings, note) {
 		}
 	}
 
-	if (!isMyNote && note.text && settings.mutedWords.some(q => q.length > 0 && !q.some(word => word == '' || !note.text.includes(word)))) {
+	if (!isMyNote && note.text && settings.mutedWords.some(q => q.length > 0 && !q.some(word => !note.text.includes(word)))) {
 		return true;
 	}
 
diff --git a/src/client/app/common/views/components/mute-and-block.vue b/src/client/app/common/views/components/mute-and-block.vue
index fdeaa97eb..1bd99d1c4 100644
--- a/src/client/app/common/views/components/mute-and-block.vue
+++ b/src/client/app/common/views/components/mute-and-block.vue
@@ -72,7 +72,7 @@ export default Vue.extend({
 
 	methods: {
 		save() {
-			this._mutedWords = this.mutedWords.split('\n').map(line => line.split(' '));
+			this._mutedWords = this.mutedWords.split('\n').map(line => line.split(' ').filter(x => x != ''));
 		}
 	}
 });