diff --git a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
index af6b0c533..4843f4670 100644
--- a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
@@ -105,21 +105,22 @@ public class HashTagActivity extends BaseActivity {
         });
         ReorderVM reorderVM = new ViewModelProvider(HashTagActivity.this).get(ReorderVM.class);
         reorderVM.getAllPinned().observe(HashTagActivity.this, pinned -> {
-            if (pinned != null) {
-                this.pinned = pinned;
-                pinnedTag = false;
-                if (pinned.pinnedTimelines != null) {
-                    for (PinnedTimeline pinnedTimeline : pinned.pinnedTimelines) {
-                        if (pinnedTimeline.tagTimeline != null) {
-                            if (pinnedTimeline.tagTimeline.name.equalsIgnoreCase(stripTag)) {
-                                this.pinnedTimeline = pinnedTimeline;
-                                pinnedTag = true;
-                                break;
-                            }
+            if (pinned == null) {
+                pinned = new Pinned();
+                pinned.pinnedTimelines = new ArrayList<>();
+            }
+            pinnedTag = false;
+            if (pinned.pinnedTimelines != null) {
+                for (PinnedTimeline pinnedTimeline : pinned.pinnedTimelines) {
+                    if (pinnedTimeline.tagTimeline != null) {
+                        if (pinnedTimeline.tagTimeline.name.equalsIgnoreCase(stripTag)) {
+                            this.pinnedTimeline = pinnedTimeline;
+                            pinnedTag = true;
+                            break;
                         }
                     }
-                    invalidateOptionsMenu();
                 }
+                invalidateOptionsMenu();
             }
         });
         if (MainActivity.filterFetched && MainActivity.mainFilters != null) {