diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php
index cae446f915..a98a17e323 100644
--- a/apps/federation/backgroundjob/getsharedsecret.php
+++ b/apps/federation/backgroundjob/getsharedsecret.php
@@ -151,6 +151,9 @@ class GetSharedSecret extends QueuedJob{
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			$this->logger->logException($e);
+		} catch (\Exception $e) {
+			$status = HTTP::STATUS_INTERNAL_SERVER_ERROR;
+			$this->logger->logException($e);
 		}
 
 		// if we received a unexpected response we try again later
diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/backgroundjob/requestsharedsecret.php
index 92305b7e8e..2db5d09545 100644
--- a/apps/federation/backgroundjob/requestsharedsecret.php
+++ b/apps/federation/backgroundjob/requestsharedsecret.php
@@ -149,6 +149,9 @@ class RequestSharedSecret extends QueuedJob {
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			$this->logger->logException($e);
+		} catch (\Exception $e) {
+			$status = HTTP::STATUS_INTERNAL_SERVER_ERROR;
+			$this->logger->logException($e);
 		}
 
 		// if we received a unexpected response we try again later