diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java
index 361c5ac6b..eca375bca 100644
--- a/src/org/fdroid/fdroid/DB.java
+++ b/src/org/fdroid/fdroid/DB.java
@@ -1350,6 +1350,12 @@ public class DB {
                 }
                 db.delete(TABLE_REPO, "address = ?", new String[] { address });
             }
+            List<App> apps = getAppsBasic(true);
+            for (App app : apps) {
+                if (app.apks.isEmpty()) {
+                    db.delete(TABLE_APP, "id = ?", new String[] { app.id });
+                }
+            }
             db.setTransactionSuccessful();
         } finally {
             db.endTransaction();