diff --git a/client/src/components/Applications/AppForm/AppForm.jsx b/client/src/components/Applications/AppForm/AppForm.jsx
index 0667f13aa..f197be6cd 100644
--- a/client/src/components/Applications/AppForm/AppForm.jsx
+++ b/client/src/components/Applications/AppForm/AppForm.jsx
@@ -692,11 +692,21 @@ export const AppSchemaForm = ({ app }) => {
                         )
                         .map((q) => q.name)
                         .sort()
-                        .map((queueName) => (
-                          <option key={queueName} value={queueName}>
-                            {queueName}
-                          </option>
-                        ))
+                        .map((queueName) =>
+                          app.definition.notes.queueFilter ? (
+                            app.definition.notes.queueFilter.includes(
+                              queueName
+                            ) && (
+                              <option key={queueName} value={queueName}>
+                                {queueName}
+                              </option>
+                            )
+                          ) : (
+                            <option key={queueName} value={queueName}>
+                              {queueName}
+                            </option>
+                          )
+                        )
                         .sort()}
                     </FormField>
                   )}
diff --git a/client/src/components/Applications/AppForm/AppForm.test.js b/client/src/components/Applications/AppForm/AppForm.test.js
index 00ed86b1f..2a6b119df 100644
--- a/client/src/components/Applications/AppForm/AppForm.test.js
+++ b/client/src/components/Applications/AppForm/AppForm.test.js
@@ -442,3 +442,58 @@ describe('AppDetail', () => {
     ).toBeDefined();
   });
 });
+
+const mockAppWithQueueFilter = {
+  ...helloWorldAppFixture,
+  definition: {
+    ...helloWorldAppFixture.definition,
+    notes: {
+      ...helloWorldAppFixture.definition.notes,
+      queueFilter: ['rtx', 'small'],
+    },
+  },
+};
+
+const mockAppWithoutQueueFilter = {
+  ...helloWorldAppFixture,
+  definition: {
+    ...helloWorldAppFixture.definition,
+    notes: {
+      ...helloWorldAppFixture.definition.notes,
+      queueFilter: null,
+    },
+  },
+};
+
+describe('AppSchemaForm queueFilter tests', () => {
+  it('renders only the queues specified in the queueFilter', () => {
+    const { container } = renderAppSchemaFormComponent(
+      mockStore(initialMockState),
+      mockAppWithQueueFilter
+    );
+
+    const targetDropdown = container.querySelector(
+      'select[name="execSystemLogicalQueue"]'
+    );
+    const options = Array.from(targetDropdown.querySelectorAll('option'));
+    expect(options).toHaveLength(2);
+    expect(options[0].textContent).toBe('rtx');
+    expect(options[1].textContent).toBe('small');
+  });
+
+  it('renders all queues when no queueFilter is present', () => {
+    const { container } = renderAppSchemaFormComponent(
+      mockStore(initialMockState),
+      mockAppWithoutQueueFilter
+    );
+
+    const targetDropdown = container.querySelector(
+      'select[name="execSystemLogicalQueue"]'
+    );
+    const options = Array.from(targetDropdown.querySelectorAll('option'));
+    expect(options).toHaveLength(3);
+    expect(options[0].textContent).toBe('development');
+    expect(options[1].textContent).toBe('rtx');
+    expect(options[2].textContent).toBe('small');
+  });
+});