diff --git a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
index 816c03ddd..f65cddbfb 100644
--- a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
@@ -432,6 +432,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
         super.onStop();
         if (updated) {
             Intent intent = new Intent(getBaseContext(), MainActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(Helper.INTENT_ACTION, Helper.REFRESH_TIMELINE);
             intent.putExtra(Helper.REFRESH_LIST_TIMELINE, refresh_list);
             startActivity(intent);
diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java
index 5f30a5d6d..0d71a7cae 100644
--- a/app/src/main/java/app/fedilab/android/client/API.java
+++ b/app/src/main/java/app/fedilab/android/client/API.java
@@ -3258,6 +3258,10 @@ public class API {
         try {
             HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
             String response = httpsConnection.get("https://" + instance + "/api/v1/videos", 10, params, null);
+            if( response == null) {
+                apiResponse.setPeertubes(peertubes);
+                return apiResponse;
+            }
             JSONObject jsonObject = new JSONObject(response);
             if( jsonObject.has("data")) {
                 JSONArray jsonArray = new JSONObject(response).getJSONArray("data");