diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index 2647d235a..6098263c7 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -729,6 +729,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
 
     private static CharSequence getVisibilityDescription(Context context, Status.Visibility visibility) {
 
+        if(visibility == null) {
+            return "";
+        }
+
         int resource;
         switch (visibility) {
             case PUBLIC:
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
index 5385dd4a2..0b9ae3614 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
@@ -221,6 +221,10 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
 
     private void setStatusVisibility(Status.Visibility visibility) {
 
+        if(visibility == null) {
+            return;
+        }
+
         int visibilityIcon;
         switch (visibility) {
             case PUBLIC: