diff --git a/lib/private/OCM/OCMDiscoveryService.php b/lib/private/OCM/OCMDiscoveryService.php
index 62313a9af80f2..377861b2eef07 100644
--- a/lib/private/OCM/OCMDiscoveryService.php
+++ b/lib/private/OCM/OCMDiscoveryService.php
@@ -55,7 +55,12 @@ public function discover(string $remote, bool $skipCache = false): IOCMProvider
 
 		if (!$skipCache) {
 			try {
-				$this->provider->import(json_decode($this->cache->get($remote) ?? '', true, 8, JSON_THROW_ON_ERROR) ?? []);
+				$cached = $this->cache->get($remote);
+				if ($cached === false) {
+					throw new OCMProviderException('Previous discovery failed.');
+				}
+
+				$this->provider->import(json_decode($cached ?? '', true, 8, JSON_THROW_ON_ERROR) ?? []);
 				if ($this->supportedAPIVersion($this->provider->getApiVersion())) {
 					return $this->provider; // if cache looks valid, we use it
 				}
@@ -82,8 +87,10 @@ public function discover(string $remote, bool $skipCache = false): IOCMProvider
 				$this->cache->set($remote, $body, 60 * 60 * 24);
 			}
 		} catch (JsonException|OCMProviderException $e) {
+			$this->cache->set($remote, false, 5 * 60);
 			throw new OCMProviderException('data returned by remote seems invalid - ' . ($body ?? ''));
 		} catch (\Exception $e) {
+			$this->cache->set($remote, false, 5 * 60);
 			$this->logger->warning('error while discovering ocm provider', [
 				'exception' => $e,
 				'remote' => $remote
@@ -92,6 +99,7 @@ public function discover(string $remote, bool $skipCache = false): IOCMProvider
 		}
 
 		if (!$this->supportedAPIVersion($this->provider->getApiVersion())) {
+			$this->cache->set($remote, false, 5 * 60);
 			throw new OCMProviderException('API version not supported');
 		}