diff --git a/src/api/helpers.js b/src/api/helpers.js
index 687ed9628..8d5d1f5e9 100644
--- a/src/api/helpers.js
+++ b/src/api/helpers.js
@@ -106,6 +106,8 @@ export const promisedRequest = async ({
         .get('content-type')
         .split(';')
         .map((x) => x.toLowerCase().trim())
+      const contentLength = parseInt(response.headers.get('content-length'))
+      if (contentLength === 0) return null
 
       switch (contentType) {
         case 'text/plain':
diff --git a/src/stores/oauth_tokens.js b/src/stores/oauth_tokens.js
index bb9bbccbf..afbbb5f46 100644
--- a/src/stores/oauth_tokens.js
+++ b/src/stores/oauth_tokens.js
@@ -12,7 +12,7 @@ export const useOAuthTokensStore = defineStore('oauthTokens', {
     fetchTokens() {
       fetchOAuthTokens({
         credentials: useOAuthStore().token,
-      }).then((tokens) => {
+      }).then(({ data: tokens }) => {
         this.swapTokens(tokens)
       })
     },