diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php
index 2eb7a9b49..2d4a71bdd 100644
--- a/app/Http/Controllers/PublicApiController.php
+++ b/app/Http/Controllers/PublicApiController.php
@@ -364,7 +364,6 @@ class PublicApiController extends Controller
                           )
                           ->whereNull(['in_reply_to_id', 'reblog_of_id'])
                           ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
-                          ->with('profile', 'hashtags', 'mentions')
                           ->whereLocal(true)
                           ->whereScope('public')
                           ->orderBy('id', 'desc')
@@ -517,7 +516,6 @@ class PublicApiController extends Controller
                       ->when($textOnlyReplies != true, function($q, $textOnlyReplies) {
                         return $q->whereNull('in_reply_to_id');
                       })
-                      ->with('profile', 'hashtags', 'mentions')
                       ->where('id', $dir, $id)
                       ->whereIn('profile_id', $following)
                       ->whereIn('visibility',['public', 'unlisted', 'private'])
@@ -564,7 +562,6 @@ class PublicApiController extends Controller
                       ->when(!$textOnlyReplies, function($q, $textOnlyReplies) {
                         return $q->whereNull('in_reply_to_id');
                       })
-                      ->with('profile', 'hashtags', 'mentions')
                       ->whereIn('profile_id', $following)
                       ->whereIn('visibility',['public', 'unlisted', 'private'])
                       ->orderBy('created_at', 'desc')
diff --git a/database/migrations/2022_10_07_045520_add_reblog_of_id_index_to_statuses_table.php b/database/migrations/2022_10_07_045520_add_reblog_of_id_index_to_statuses_table.php
new file mode 100644
index 000000000..85a055558
--- /dev/null
+++ b/database/migrations/2022_10_07_045520_add_reblog_of_id_index_to_statuses_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddReblogOfIdIndexToStatusesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('statuses', function (Blueprint $table) {
+            $sc = Schema::getConnection()->getDoctrineSchemaManager();
+            if(array_key_exists('statuses_in_reply_or_reblog_index', $sc)) {
+                $table->dropIndex('statuses_in_reply_or_reblog_index');
+            }
+
+            $table->index('in_reply_to_id');
+            $table->index('reblog_of_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('statuses', function (Blueprint $table) {
+            //
+        });
+    }
+}