diff --git a/.gitignore b/.gitignore
index 6a0c899133d0625456cc06e01cdee3aaba3bc4dd..b0ef2dda433e4d1622ab4e3dadc0c751d47a6ec3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,7 @@ services/notification/notification.log
 **/coverage.xml
 **/coverage.json
 pyproject.toml
+package-lock.json
 
 # Ignore docker volume mount points
 services/**/**/apps
diff --git a/shared/workspaces/workspaces/capability/services/capability_service.py b/shared/workspaces/workspaces/capability/services/capability_service.py
index 9888553938a0e3e5d8abea8750d6f680a7df4836..7376be8e52a005bc9687a1d87a7642f9d8a4b1e5 100644
--- a/shared/workspaces/workspaces/capability/services/capability_service.py
+++ b/shared/workspaces/workspaces/capability/services/capability_service.py
@@ -102,9 +102,10 @@ class CapabilityService(CapabilityServiceIF):
                 == CapabilityStepType.PrepareAndRunWorkflow
             ):
                 # Return capability engine to available state
-                self.queues[execution.capability.name].complete_execution(
-                    capability_event.execution_id
-                )
+                if self.queues:
+                    self.queues.get(execution.capability.name).complete_execution(
+                        capability_event.execution_id
+                    )
 
             if execution.current_step != len(step_sequence)-1:
                 # Execution is not on its last step
@@ -127,7 +128,7 @@ class CapabilityService(CapabilityServiceIF):
                 self.enqueue_execution(execution, ExecutionPriority.Default.value)
 
             # Update execution record's state
-            execution.state = ExecutionState.Ready.name
+            # execution.state = ExecutionState.Ready.name
             self.capability_info.save_execution(execution)
         else:
             # TODO: Logging