diff --git a/app/forms/anti-affinity-group-member-add.tsx b/app/forms/anti-affinity-group-member-add.tsx
index 3aeee4089..3f74f7057 100644
--- a/app/forms/anti-affinity-group-member-add.tsx
+++ b/app/forms/anti-affinity-group-member-add.tsx
@@ -77,10 +77,10 @@ export default function AddAntiAffinityGroupMemberForm({ instances, onDismiss }:
               control={form.control}
             />
           </form>
-          {!canAddInstance && (
+          {selectedInstance && !canAddInstance && (
             <Message
               variant="notice"
-              content="An instance must be stopped to add it to a group"
+              content="This instance must be stopped to add it to a group"
             />
           )}
         </Modal.Section>
@@ -89,7 +89,7 @@ export default function AddAntiAffinityGroupMemberForm({ instances, onDismiss }:
         onDismiss={onDismiss}
         actionText="Add to group"
         formId={formId}
-        disabled={!canAddInstance}
+        disabled={!selectedInstance || !canAddInstance}
       />
     </Modal>
   )