diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
index 5bb05f96e..3022fdfcb 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -369,7 +369,6 @@ public class AppProvider extends FDroidProvider {
     private static final String PATH_SEARCH_INSTALLED = "searchInstalled";
     private static final String PATH_SEARCH_CAN_UPDATE = "searchCanUpdate";
     private static final String PATH_SEARCH_REPO = "searchRepo";
-    private static final String PATH_NO_APKS = "noApks";
     protected static final String PATH_APPS = "apps";
     protected static final String PATH_SPECIFIC_APP = "app";
     private static final String PATH_RECENTLY_UPDATED = "recentlyUpdated";
@@ -383,8 +382,7 @@ public class AppProvider extends FDroidProvider {
     private static final int CAN_UPDATE = CODE_SINGLE + 1;
     private static final int INSTALLED = CAN_UPDATE + 1;
     private static final int SEARCH = INSTALLED + 1;
-    private static final int NO_APKS = SEARCH + 1;
-    private static final int RECENTLY_UPDATED = NO_APKS + 1;
+    private static final int RECENTLY_UPDATED = SEARCH + 1;
     private static final int NEWLY_ADDED = RECENTLY_UPDATED + 1;
     private static final int CATEGORY = NEWLY_ADDED + 1;
     private static final int CALC_SUGGESTED_APKS = CATEGORY + 1;
@@ -408,7 +406,6 @@ public class AppProvider extends FDroidProvider {
         MATCHER.addURI(getAuthority(), PATH_REPO + "/#", REPO);
         MATCHER.addURI(getAuthority(), PATH_CAN_UPDATE, CAN_UPDATE);
         MATCHER.addURI(getAuthority(), PATH_INSTALLED, INSTALLED);
-        MATCHER.addURI(getAuthority(), PATH_NO_APKS, NO_APKS);
         MATCHER.addURI(getAuthority(), PATH_HIGHEST_PRIORITY + "/*", HIGHEST_PRIORITY);
         MATCHER.addURI(getAuthority(), PATH_SPECIFIC_APP + "/#/*", CODE_SINGLE);
         MATCHER.addURI(getAuthority(), PATH_CALC_PREFERRED_METADATA, CALC_PREFERRED_METADATA);
@@ -437,10 +434,6 @@ public class AppProvider extends FDroidProvider {
             .build();
     }
 
-    public static Uri getNoApksUri() {
-        return Uri.withAppendedPath(getContentUri(), PATH_NO_APKS);
-    }
-
     public static Uri getInstalledUri() {
         return Uri.withAppendedPath(getContentUri(), PATH_INSTALLED);
     }
@@ -688,13 +681,6 @@ public class AppProvider extends FDroidProvider {
         return new AppQuerySelection(selection, args);
     }
 
-    private AppQuerySelection queryNoApks() {
-        final String apk = getApkTableName();
-        final String app = getTableName();
-        String selection = "(SELECT COUNT(*) FROM " + apk + " WHERE " + apk + "." + ApkTable.Cols.APP_ID + " = " + app + "." + Cols.ROW_ID + ") = 0";
-        return new AppQuerySelection(selection);
-    }
-
     static AppQuerySelection queryPackageNames(String packageNames, String packageNameField) {
         String[] args = packageNames.split(",");
         String selection = packageNameField + " IN (" + generateQuestionMarksForInClause(args.length) + ")";
@@ -770,10 +756,6 @@ public class AppProvider extends FDroidProvider {
                 repoIsKnown = true;
                 break;
 
-            case NO_APKS:
-                selection = selection.add(queryNoApks());
-                break;
-
             case CATEGORY:
                 selection = selection.add(queryCategory(uri.getLastPathSegment()));
                 includeSwap = false;
@@ -833,11 +815,19 @@ public class AppProvider extends FDroidProvider {
 
     @Override
     public int delete(Uri uri, String where, String[] whereArgs) {
-        if (MATCHER.match(uri) != NO_APKS) {
+        if (MATCHER.match(uri) != REPO) {
             throw new UnsupportedOperationException("Delete not supported for " + uri + ".");
         }
 
-        AppQuerySelection selection = new AppQuerySelection(where, whereArgs).add(queryNoApks());
+        long repoId = Long.parseLong(uri.getLastPathSegment());
+
+        final String catJoin = getCatJoinTableName();
+        final String app = getTableName();
+        String query = "DELETE FROM " + catJoin + " WHERE " + CatJoinTable.Cols.APP_METADATA_ID + " IN " +
+                "(SELECT " + Cols.ROW_ID + " FROM " + app + " WHERE " + app + "." + Cols.REPO_ID + " = ?)";
+        db().execSQL(query, new String[] {String.valueOf(repoId)});
+
+        AppQuerySelection selection = new AppQuerySelection(where, whereArgs).add(queryRepo(repoId));
         return db().delete(getTableName(), selection.getSelection(), selection.getArgs());
     }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java b/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java
index e5a6b5347..e8491f00b 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java
@@ -229,9 +229,9 @@ public class RepoProvider extends FDroidProvider {
             int apkCount = resolver.delete(apkUri, null, null);
             Utils.debugLog(TAG, "Removed " + apkCount + " apks from repo " + repo.name);
 
-            Uri appUri = AppProvider.getNoApksUri();
+            Uri appUri = AppProvider.getRepoUri(repo);
             int appCount = resolver.delete(appUri, null, null);
-            Utils.debugLog(TAG, "Removed " + appCount + " apps with no apks.");
+            Utils.debugLog(TAG, "Removed " + appCount + " apps from repo " + repo.address + ".");
 
             AppProvider.Helper.recalculatePreferredMetadata(context);
         }