diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 43b6f26f..8069390f 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -182,12 +182,12 @@ def status_update_json(apps, apks):
                         if appid not in failedBuilds:
                             failedBuilds[appid] = []
                         failedBuilds[appid].append(build.versionCode)
-        if validapks == 0:
-            output['noPackages'].append(appid)
-        if not gotcurrentver:
-            output['needsUpdate'].append(appid)
-        if app.get('UpdateCheckMode') == 'None' and not app.get('Disabled'):
-            output['noUpdateCheck'].append(appid)
+            if validapks == 0:
+                output['noPackages'].append(appid)
+            if not gotcurrentver:
+                output['needsUpdate'].append(appid)
+            if app.get('UpdateCheckMode') == 'None':
+                output['noUpdateCheck'].append(appid)
     common.write_status_json(output, options.pretty)