diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 1fb020ea..86070c67 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -176,7 +176,7 @@ def status_update_json(apps, apks):
         validapks = 0
         if app.get('Disabled'):
             output['disabled'].append(appid)
-        elif app["ArchivePolicy"] == 0:
+        elif app.get("ArchivePolicy") == 0:
             output['archivePolicy0'].append(appid)
         else:
             for build in app.get('Builds', []):
@@ -1876,7 +1876,7 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
 
     for appid, app in apps.items():
 
-        if app.get('ArchivePolicy'):
+        if app.get('ArchivePolicy') is not None:
             keepversions = app['ArchivePolicy']
         else:
             keepversions = defaultkeepversions