diff --git a/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html b/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html
index c6a1486e7c51acd51c3d30938e27e4e5e39ad91a..4b3186e6adbab1a9f71d5cea964ab378e5fe50fa 100644
--- a/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html
+++ b/apps/web/src/app/workspaces/components/capability-request/components/request-operations/request-operations.component.html
@@ -13,7 +13,7 @@
       *ngIf="
         capabilityRequest.state === 'Complete' &&
         (capabilityRequest.capability_name === 'std_calibration' ||
-          capabilityRequest.capability_name === 'restore_cms')
+          capabilityRequest.capability_name === 'restore_cms') && selectedVersion.current_execution
       "
     >
       <button
@@ -37,7 +37,7 @@
         (capabilityRequest.state === 'Complete' ||
           (selectedVersion.current_execution && selectedVersion.current_execution.state_name === 'Awaiting QA') ||
           (selectedVersion.current_execution && selectedVersion.current_execution.state_name === 'AoD Review')
-          )
+          ) && selectedVersion.current_execution
       "
     >
       <button
diff --git a/shared/workspaces/workspaces/capability/schema.py b/shared/workspaces/workspaces/capability/schema.py
index fba824d2b7802da0f0acc9f50140854c42bb7d1f..2ff458fbfb47d1854c2b3e60dd1f7268b1014105 100644
--- a/shared/workspaces/workspaces/capability/schema.py
+++ b/shared/workspaces/workspaces/capability/schema.py
@@ -571,7 +571,6 @@ class QaPass(Action):
                     f"{version.current_execution.current_workflow_request_id}/qa_fail"
                 )
 
-
     @staticmethod
     def abort_running_execution(version: CapabilityVersion):
         """