diff --git a/apps/web/src/app/workspaces/components/capability-request/capability-request.component.ts b/apps/web/src/app/workspaces/components/capability-request/capability-request.component.ts
index e97b11d273242dbf755a1a7054b497aa4d0994b7..daa5e1b724dc57eaf72bf16fee03e88fc80deaa3 100644
--- a/apps/web/src/app/workspaces/components/capability-request/capability-request.component.ts
+++ b/apps/web/src/app/workspaces/components/capability-request/capability-request.component.ts
@@ -85,8 +85,12 @@ export class CapabilityRequestComponent implements OnInit, OnDestroy {
     next: (capabilityVersion) => {
       if (capabilityVersion !== undefined) {
         this.latestVersion = capabilityVersion;
-        // Set selected version to be the request's current version if no version is selected
-        if (this.currentVersion === undefined) {
+        // Set selected version to be the request's latest version
+        // If no version is selected or if the selected version is the latest version
+        if (
+          this.currentVersion === undefined ||
+          this.currentVersion.version_number === this.latestVersion.version_number
+        ) {
           this.setVersion(this.latestVersion);
         }
       } else {