diff --git a/app/src/main/java/app/fedilab/android/client/entities/api/Status.java b/app/src/main/java/app/fedilab/android/client/entities/api/Status.java
index a21e3d5f..5604c3f5 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/api/Status.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/api/Status.java
@@ -109,6 +109,7 @@ public class Status implements Serializable, Cloneable {
     public transient boolean setCursorToEnd = false;
     public transient int cursorPosition = 0;
     public transient boolean submitted = false;
+    public transient boolean spoilerChecked = false;
 
     public enum PositionFetchMore {
         TOP,
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 ef4ba8b1..635f628a 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
@@ -1229,11 +1229,19 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 holder.binding.buttonVisibility.setImageResource(R.drawable.ic_compose_visibility_public);
                 statusDraft.visibility = MastodonHelper.visibility.PUBLIC.name();
             });
+            if (statusDraft.spoilerChecked) {
+                holder.binding.contentSpoiler.setVisibility(View.VISIBLE);
+            } else {
+                holder.binding.contentSpoiler.setVisibility(View.GONE);
+            }
             holder.binding.buttonSensitive.setOnClickListener(v -> {
-                if (holder.binding.contentSpoiler.getVisibility() == View.VISIBLE)
+                if (holder.binding.contentSpoiler.getVisibility() == View.VISIBLE) {
+                    statusDraft.spoilerChecked = false;
                     holder.binding.contentSpoiler.setVisibility(View.GONE);
-                else
+                } else {
                     holder.binding.contentSpoiler.setVisibility(View.VISIBLE);
+                    statusDraft.spoilerChecked = true;
+                }
             });
             //Last compose drawer
             buttonVisibility(holder);