diff --git a/app/serializers/rest/status_edit_serializer.rb b/app/serializers/rest/status_edit_serializer.rb
index 476e946a14..8d8923bf14 100644
--- a/app/serializers/rest/status_edit_serializer.rb
+++ b/app/serializers/rest/status_edit_serializer.rb
@@ -5,7 +5,8 @@ class REST::StatusEditSerializer < ActiveModel::Serializer
 
   has_one :account, serializer: REST::AccountSerializer
 
-  attributes :content, :spoiler_text, :markdown, :sensitive, :created_at
+  attributes :content, :spoiler_text, :sensitive, :created_at
+  attribute :markdown_opt, key: :markdown
 
   has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :emojis, serializer: REST::CustomEmojiSlimSerializer
@@ -19,4 +20,8 @@ class REST::StatusEditSerializer < ActiveModel::Serializer
   def poll
     { options: object.poll_options.map { |title| { title: title } } }
   end
+
+  def markdown_opt
+    object.markdown
+  end
 end
diff --git a/db/migrate/20230314021909_add_group_message_following_only_to_accounts.rb b/db/migrate/20230314021909_add_group_message_following_only_to_accounts.rb
index 4712e9dd3e..1f59c7c044 100644
--- a/db/migrate/20230314021909_add_group_message_following_only_to_accounts.rb
+++ b/db/migrate/20230314021909_add_group_message_following_only_to_accounts.rb
@@ -2,6 +2,6 @@
 
 class AddGroupMessageFollowingOnlyToAccounts < ActiveRecord::Migration[6.1]
   def change
-    add_column :accounts, :group_message_following_only, :boolean
+    add_column :accounts, :group_message_following_only, :boolean, null: false, default: false
   end
 end
diff --git a/db/migrate/20230314081013_add_group_allow_private_message_to_accounts.rb b/db/migrate/20230314081013_add_group_allow_private_message_to_accounts.rb
index 367e1c1d0a..adba09a942 100644
--- a/db/migrate/20230314081013_add_group_allow_private_message_to_accounts.rb
+++ b/db/migrate/20230314081013_add_group_allow_private_message_to_accounts.rb
@@ -2,6 +2,6 @@
 
 class AddGroupAllowPrivateMessageToAccounts < ActiveRecord::Migration[6.1]
   def change
-    add_column :accounts, :group_allow_private_message, :boolean
+    add_column :accounts, :group_allow_private_message, :boolean, null: false, default: false
   end
 end
diff --git a/db/migrate/20230412005311_add_markdown_to_statuses.rb b/db/migrate/20230412005311_add_markdown_to_statuses.rb
index a9730796e5..de4fadcb78 100644
--- a/db/migrate/20230412005311_add_markdown_to_statuses.rb
+++ b/db/migrate/20230412005311_add_markdown_to_statuses.rb
@@ -3,7 +3,7 @@
 class AddMarkdownToStatuses < ActiveRecord::Migration[6.1]
   def change
     safety_assured do
-      add_column :statuses, :markdown, :boolean, default: false
+      add_column :statuses, :markdown, :boolean, default: false, null: false
     end
   end
 end
diff --git a/db/migrate/20230412073021_add_markdown_to_status_edits.rb b/db/migrate/20230412073021_add_markdown_to_status_edits.rb
index 8dd5711487..72a10c1795 100644
--- a/db/migrate/20230412073021_add_markdown_to_status_edits.rb
+++ b/db/migrate/20230412073021_add_markdown_to_status_edits.rb
@@ -3,7 +3,7 @@
 class AddMarkdownToStatusEdits < ActiveRecord::Migration[6.1]
   def change
     safety_assured do
-      add_column :status_edits, :markdown, :boolean, default: false
+      add_column :status_edits, :markdown, :boolean, default: false, null: false
     end
   end
 end
diff --git a/db/migrate/20230428111230_add_emoji_reaction_streaming_to_accounts.rb b/db/migrate/20230428111230_add_emoji_reaction_streaming_to_accounts.rb
index 43c7df805d..845a8c46ac 100644
--- a/db/migrate/20230428111230_add_emoji_reaction_streaming_to_accounts.rb
+++ b/db/migrate/20230428111230_add_emoji_reaction_streaming_to_accounts.rb
@@ -3,7 +3,7 @@
 class AddEmojiReactionStreamingToAccounts < ActiveRecord::Migration[6.1]
   def change
     safety_assured do
-      add_column :accounts, :stop_emoji_reaction_streaming, :boolean, default: false
+      add_column :accounts, :stop_emoji_reaction_streaming, :boolean, default: false, null: false
     end
   end
 end
diff --git a/db/migrate/20230510004621_remove_stop_emoji_reaction_streaming_from_accounts.rb b/db/migrate/20230510004621_remove_stop_emoji_reaction_streaming_from_accounts.rb
index 3bc96d3893..2b21c554ff 100644
--- a/db/migrate/20230510004621_remove_stop_emoji_reaction_streaming_from_accounts.rb
+++ b/db/migrate/20230510004621_remove_stop_emoji_reaction_streaming_from_accounts.rb
@@ -9,7 +9,7 @@ class RemoveStopEmojiReactionStreamingFromAccounts < ActiveRecord::Migration[6.1
 
   def down
     safety_assured do
-      add_column :accounts, :stop_emoji_reaction_streaming, :boolean, null: true, default: false
+      add_column :accounts, :stop_emoji_reaction_streaming, :boolean, null: false, default: false
     end
   end
 end
diff --git a/db/migrate/20231212225737_improve_index_for_public_timeline_speed.rb b/db/migrate/20231212225737_improve_index_for_public_timeline_speed.rb
index 5902df0802..efd821f018 100644
--- a/db/migrate/20231212225737_improve_index_for_public_timeline_speed.rb
+++ b/db/migrate/20231212225737_improve_index_for_public_timeline_speed.rb
@@ -4,17 +4,17 @@ class ImproveIndexForPublicTimelineSpeed < ActiveRecord::Migration[7.0]
   disable_ddl_transaction!
 
   def up
-    add_index :statuses, [:id, :account_id], name: :index_statuses_local_20231213, algorithm: :concurrently, order: { id: :desc },
+    add_index :statuses, [:id, :account_id], name: :index_statuses_local_20231213, algorithm: :concurrently, order: { id: :desc }, # rubocop:disable Naming/VariableNumber
                                              where: '(local OR (uri IS NULL)) AND deleted_at IS NULL AND visibility IN (0, 10, 11) AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))'
-    add_index :statuses, [:id, :account_id], name: :index_statuses_public_20231213, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility IN (0, 10, 11) AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))'
-    remove_index :statuses, name: :index_statuses_local_20190824
-    remove_index :statuses, name: :index_statuses_public_20200119
+    add_index :statuses, [:id, :account_id], name: :index_statuses_public_20231213, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility IN (0, 10, 11) AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber
+    remove_index :statuses, name: :index_statuses_local_20190824 # rubocop:disable Naming/VariableNumber
+    remove_index :statuses, name: :index_statuses_public_20200119 # rubocop:disable Naming/VariableNumber
   end
 
   def down
-    add_index :statuses, [:id, :account_id], name: :index_statuses_local_20190824, algorithm: :concurrently, order: { id: :desc }, where: '(local OR (uri IS NULL)) AND deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))'
-    add_index :statuses, [:id, :account_id], name: :index_statuses_public_20200119, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))'
-    remove_index :statuses, name: :index_statuses_local_20231213
-    remove_index :statuses, name: :index_statuses_public_20231213
+    add_index :statuses, [:id, :account_id], name: :index_statuses_local_20190824, algorithm: :concurrently, order: { id: :desc }, where: '(local OR (uri IS NULL)) AND deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber
+    add_index :statuses, [:id, :account_id], name: :index_statuses_public_20200119, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber
+    remove_index :statuses, name: :index_statuses_local_20231213 # rubocop:disable Naming/VariableNumber
+    remove_index :statuses, name: :index_statuses_public_20231213 # rubocop:disable Naming/VariableNumber
   end
 end