diff --git a/src/frontend/src/forms/StockForms.tsx b/src/frontend/src/forms/StockForms.tsx
index 47ee508363..a85709d05e 100644
--- a/src/frontend/src/forms/StockForms.tsx
+++ b/src/frontend/src/forms/StockForms.tsx
@@ -85,21 +85,21 @@ export function useStockFields({
   const batchGenerator = useBatchCodeGenerator({
     modalId: modalId,
     initialQuery: {
-      part: partInstance?.pk || partId
+      part: partId
     }
   });
 
   const serialGenerator = useSerialNumberGenerator({
     modalId: modalId,
     initialQuery: {
-      part: partInstance?.pk || partId
+      part: partId
     }
   });
 
   return useMemo(() => {
     const fields: ApiFormFieldSet = {
       part: {
-        value: partInstance.pk,
+        value: partId || partInstance?.pk,
         disabled: !create,
         filters: {
           active: create ? true : undefined
@@ -108,6 +108,14 @@ export function useStockFields({
           // Update the tracked part instance
           setPartInstance(record);
 
+          serialGenerator.update({
+            part: value
+          });
+
+          batchGenerator.update({
+            part: value
+          });
+
           // Clear the 'supplier_part' field if the part is changed
           setSupplierPart(null);
 
diff --git a/src/frontend/src/hooks/UseGenerator.tsx b/src/frontend/src/hooks/UseGenerator.tsx
index 790dc81844..c22da48931 100644
--- a/src/frontend/src/hooks/UseGenerator.tsx
+++ b/src/frontend/src/hooks/UseGenerator.tsx
@@ -87,8 +87,8 @@ export function useGenerator(props: GeneratorProps): GeneratorState {
     refetchOnWindowFocus: false,
     queryFn: async () => {
       const generatorQuery = {
-        ...debouncedQuery,
-        ...(props.initialQuery ?? {})
+        ...(props.initialQuery ?? {}),
+        ...debouncedQuery
       };
 
       if (!isEnabled()) {
@@ -111,6 +111,8 @@ export function useGenerator(props: GeneratorProps): GeneratorState {
             `Error generating ${props.key} @ ${props.endpoint}:`,
             error
           );
+
+          return null;
         });
     }
   });