diff --git a/dashboard/src/components/app/Resources.vue b/dashboard/src/components/app/Resources.vue
index b424c62a8..16ab4de69 100644
--- a/dashboard/src/components/app/Resources.vue
+++ b/dashboard/src/components/app/Resources.vue
@@ -3,6 +3,7 @@
 import { ref, onMounted, computed, nextTick } from 'vue';
 import { Button, FormGroup, TagInput } from '@cloudron/pankow';
 import { prettyBinarySize } from '@cloudron/pankow/utils';
+import { ISTATES } from '../../constants.js';
 import AppsModel from '../../models/AppsModel.js';
 import SystemModel from '../../models/SystemModel.js';
 
@@ -118,7 +119,7 @@ onMounted(async () => {
       </datalist>
     </FormGroup>
     <br/>
-    <Button @click="onSubmitMemoryLimit()" :loading="memoryLimitBusy" :disabled="memoryLimitBusy || memoryLimit === currentMemoryLimit || app.error || app.taskId" v-tooltip="app.error ? 'App is in error state' : (app.taskId ? 'App is busy' : '')">{{ $t('app.resources.memory.resizeAction') }}</Button>
+    <Button @click="onSubmitMemoryLimit()" :loading="memoryLimitBusy" :disabled="memoryLimitBusy || (!app.error && memoryLimit === currentMemoryLimit) || (app.error && app.error.details.installationState !== ISTATES.PENDING_RESIZE) || app.taskId" v-tooltip="app.error ? 'App is in error state' : (app.taskId ? 'App is busy' : '')">{{ $t('app.resources.memory.resizeAction') }}</Button>
 
     <hr/>
 
@@ -133,7 +134,7 @@ onMounted(async () => {
       </datalist>
     </FormGroup>
     <br/>
-    <Button @click="onSubmitCpuQuota()" :loading="cpuQuotaBusy" :disabled="cpuQuotaBusy || cpuQuota === currentCpuQuota || app.error || app.taskId">{{ $t('app.resources.cpu.setAction') }}</Button>
+    <Button @click="onSubmitCpuQuota()" :loading="cpuQuotaBusy" :disabled="cpuQuotaBusy || (!app.error && cpuQuota === currentCpuQuota) || (app.error && app.error.details.installationState !== ISTATES.PENDING_RESIZE) || app.taskId">{{ $t('app.resources.cpu.setAction') }}</Button>
 
     <hr/>