diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
index 46a9d1892..5d7503f5b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
@@ -333,7 +333,10 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
                     tagsNone.chipifyAllUnterminatedTokens();
                     String name = editText.getText().toString().trim();
                     String mainHashtag = tagMain.getText().toString().trim();
-                    if (TextUtils.isEmpty(mainHashtag)) mainHashtag = name;
+                    if (TextUtils.isEmpty(mainHashtag)) {
+                        mainHashtag = name;
+                        name = null;
+                    }
                     if (TextUtils.isEmpty(mainHashtag)) {
                         Toast.makeText(ctx, R.string.sk_add_timeline_tag_error_empty, Toast.LENGTH_SHORT).show();
                         onSave.accept(null);