diff --git a/src/services.js b/src/services.js
index 6e4f69b49..d39f26dae 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1948,7 +1948,8 @@ async function setupOidc(app, options) {
     };
 
     // openid client_id is appId for now
-    await oidc.clients.add(app.id, data);
+    const [error] = await safe(oidc.clients.add(app.id, data));
+    if (error && error.reason !== BoxError.ALREADY_EXISTS) throw error;
 }
 
 async function teardownOidc(app, options) {