diff --git a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
index ce04633e7..be51232f0 100644
--- a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
@@ -453,7 +453,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
 
     public static String getVisibility(String defaultVisibility) {
         int tootVisibility = visibilityToNumber(defaultVisibility);
-        if (currentAccount != null && currentAccount.mastodon_account.source != null) {
+        if (currentAccount != null && currentAccount.mastodon_account != null && currentAccount.mastodon_account.source != null) {
             int userVisibility = visibilityToNumber(currentAccount.mastodon_account.source.privacy);
             if (tootVisibility > userVisibility) {
                 return visibilityToString(userVisibility);
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index b4aa1ad1d..7fa49c260 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -482,7 +482,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             if (attachmentList != null && attachmentList.size() > 0) {
                 holder.binding.sensitiveMedia.setVisibility(View.VISIBLE);
                 if (!statusList.get(position).sensitive) {
-                    if (currentAccount.mastodon_account.source != null) {
+                    if (currentAccount != null && currentAccount.mastodon_account != null && currentAccount.mastodon_account.source != null) {
                         holder.binding.sensitiveMedia.setChecked(currentAccount.mastodon_account.source.sensitive);
                         statusList.get(position).sensitive = currentAccount.mastodon_account.source.sensitive;
                     } else {