diff --git a/src/middlewared/middlewared/plugins/apps/schema_normalization.py b/src/middlewared/middlewared/plugins/apps/schema_normalization.py
index a09ae463886ac..ee17fd8ff8f49 100644
--- a/src/middlewared/middlewared/plugins/apps/schema_normalization.py
+++ b/src/middlewared/middlewared/plugins/apps/schema_normalization.py
@@ -109,7 +109,7 @@ async def normalize_gpu_configuration(self, attr, value, complete_config, contex
             gpu['pci_slot']: gpu
             for gpu in await self.middleware.call('app.gpu_choices_internal') if not gpu['error']
         }
-        if not gpu_choices:
+        if not any(gpu['vendor'] != 'NVIDIA' for gpu in gpu_choices.values()):
             value['use_all_gpus'] = False
 
         for nvidia_gpu_pci_slot in list(value['nvidia_gpu_selection']):