diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/apis/RedditAPI.java b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/RedditAPI.java
index 4567bd84..487abd3d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/apis/RedditAPI.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/apis/RedditAPI.java
@@ -161,7 +161,7 @@ public interface RedditAPI {
     @POST("{subredditNamePrefixed}/api/selectflair")
     Call<String> selectFlair(@Path("subredditNamePrefixed") String subredditName, @HeaderMap Map<String, String> headers, @FieldMap Map<String, String> params);
 
-    @GET("/message/{where}.json?raw_json=1")
+    @GET("/message/{where}.json?raw_json=1&limit=100")
     Call<String> getMessages(@HeaderMap Map<String, String> headers, @Path("where") String where, @Query("after") String after);
 
     @FormUrlEncoded
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java
index 40ba795f..9bb97bcd 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java
@@ -1385,7 +1385,9 @@ public class PostFragment extends PostFragmentBase implements FragmentCommunicat
 
     @Override
     public void onDestroy() {
-        binding.recyclerViewPostFragment.addOnWindowFocusChangedListener(null);
+        if (mAdapter != null && binding.recyclerViewPostFragment != null) {
+            binding.recyclerViewPostFragment.addOnWindowFocusChangedListener(null);
+        }
         super.onDestroy();
     }