diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
index c8ef38b9c..d61684dbe 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
@@ -228,6 +228,9 @@ public class DBHelper extends SQLiteOpenHelper {
      * Only used for testing. Not quite sure how to mock a singleton variable like this.
      */
     public static void clearDbHelperSingleton() {
+        if (instance != null) {
+            instance.close();
+        }
         instance = null;
     }