diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index 8c18df9cf..cda080777 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -1683,9 +1683,6 @@ public abstract class BaseMainActivity extends BaseActivity
         if (mPageReferenceMap != null)
             mPageReferenceMap = null;
         PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("isMainActivityRunning", false).apply();
-        if (Sqlite.db != null) {
-            Sqlite.db.close();
-        }
     }
 
     @Override
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
index e10b1e494..6d67373c7 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
@@ -183,6 +183,7 @@ public class DisplayStatusFragment extends Fragment implements OnPostActionInter
             type = RetrieveFeedsAsyncTask.Type.CHANNEL;
 
 
+        assert context != null;
         SQLiteDatabase db = Sqlite.getInstance(context.getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         //instanceType should not be null only for Peertube accounts