diff --git a/form.js b/form.js
index 281b5db1637f2846fd36002e1c1aa06c8c5d79a8..253d86415d7a5dd1348d42573e914c7991421b15 100644
--- a/form.js
+++ b/form.js
@@ -27,9 +27,10 @@ function set_partition_change_handler() {
 }
 
 function toggle_gpu_visibility(event) {
-  const show = /pascal|ampere/.test(event.target.value);
-  const selector = '#batch_connect_session_context_bc_num_gpus';
-  toggle_visibilty_of_form_group(selector, show);
+  const partition = event.target.value;
+  const gpu_selector = '#batch_connect_session_context_bc_num_gpus';
+
+  toggle_visibilty_of_form_group(gpu_selector, table[partition]["max_gpu"] != -1);
 }
 
 function toggle_visibilty_of_form_group(form_id, show) {