diff --git a/app/portainer/oauth/components/oauth-settings/oauth-settings-controller.js b/app/portainer/oauth/components/oauth-settings/oauth-settings-controller.js
index 84b8634f9..ce7f6ec47 100644
--- a/app/portainer/oauth/components/oauth-settings/oauth-settings-controller.js
+++ b/app/portainer/oauth/components/oauth-settings/oauth-settings-controller.js
@@ -15,5 +15,9 @@ angular.module('portainer.oauth').controller('OAuthSettingsController', function
     if (ctrl.settings.AuthorizationURI !== '') {
       ctrl.state.provider.authUrl = ctrl.settings.AuthorizationURI;
     }
+
+    if (ctrl.settings.DefaultTeamID === 0) {
+      ctrl.settings.DefaultTeamID = null;
+    }
   }
 });