diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js
index a8243f40..48a71fb5 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js
@@ -1,6 +1,6 @@
 export default function computeAction(computation, node) {
   const prop = node.data;
-  if (prop.uses) {
+  if (Number.isFinite(prop.uses?.value)) {
     prop.usesLeft = prop.uses.value - (prop.usesUsed || 0);
     if (!prop.usesLeft) {
       prop.insufficientResources = true;
diff --git a/app/imports/client/ui/properties/viewers/ActionViewer.vue b/app/imports/client/ui/properties/viewers/ActionViewer.vue
index 2cea866a..de20f2fe 100644
--- a/app/imports/client/ui/properties/viewers/ActionViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ActionViewer.vue
@@ -65,7 +65,7 @@
         :value="reset"
       />
       <property-field
-        v-if="model.resources.conditions.length"
+        v-if="model.resources.conditions && model.resources.conditions.length"
         name="Conditions"
       >
         <div style="width: 100%;">