diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
index cf5839e499424..7e188f0c1f529 100644
--- a/lib/private/App/AppStore/Fetcher/AppFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -106,6 +106,12 @@ protected function fetch($ETag, $content) {
 				}
 			}
 
+			if (empty($releases)) {
+				// Remove apps that don't have a matching release
+				$response['data'][$dataKey] = [];
+				continue;
+			}
+
 			// Get the highest version
 			$versions = [];
 			foreach($releases as $release) {
@@ -129,7 +135,7 @@ protected function fetch($ETag, $content) {
 			}
 		}
 
-		$response['data'] = array_values($response['data']);
+		$response['data'] = array_values(array_filter($response['data']));
 		return $response;
 	}