diff --git a/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
index 0b8abd410..5060b388b 100644
--- a/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
+++ b/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
@@ -73,7 +73,7 @@ public class LocalRepoManager {
     }
 
     private LocalRepoManager(Context c) {
-        context = c;
+        context = c.getApplicationContext();
         pm = c.getPackageManager();
         assetManager = c.getAssets();
         prefs = PreferenceManager.getDefaultSharedPreferences(c);
diff --git a/src/org/fdroid/fdroid/net/LocalHTTPD.java b/src/org/fdroid/fdroid/net/LocalHTTPD.java
index eea5ef5d9..1eaa2e67d 100644
--- a/src/org/fdroid/fdroid/net/LocalHTTPD.java
+++ b/src/org/fdroid/fdroid/net/LocalHTTPD.java
@@ -27,7 +27,7 @@ public class LocalHTTPD extends NanoHTTPD {
         super(FDroidApp.ipAddressString, FDroidApp.port);
         this.logRequests = false;
         this.webRoot = webRoot;
-        this.context = context;
+        this.context = context.getApplicationContext();
         if (useHttps)
             enableHTTPS();
     }