diff --git a/client/src/pages/RoleForm.js b/client/src/pages/RoleForm.js
index d218a4ba..16f63b05 100644
--- a/client/src/pages/RoleForm.js
+++ b/client/src/pages/RoleForm.js
@@ -264,7 +264,7 @@ export const RoleForm = () => {
 
     const renderForm = () => {
         const valid = isValid();
-        const disabledSubmit = !valid && !initial;
+        const disabledSubmit = (!valid && !initial) || !validOrganizationGUID;
         const filteredProviders = providers.filter(option => !applications.some(app => app && option.value === app.value));
         return (<>
                 <h2 className="section-separator">