diff --git a/src/components/POLine/POLineDetails/POLineDetailsForm.js b/src/components/POLine/POLineDetails/POLineDetailsForm.js
index fcff839b3..2c7a5ef93 100644
--- a/src/components/POLine/POLineDetails/POLineDetailsForm.js
+++ b/src/components/POLine/POLineDetails/POLineDetailsForm.js
@@ -71,7 +71,7 @@ function POLineDetailsForm({
   );
 
   const onReceiptStatusChange = useCallback(({ target: { value } }) => {
-    change('receiptStatus', value);
+    change('receiptStatus', value || undefined);
 
     if (!isPostPendingOrder && isReceiptNotRequired(value)) {
       change('checkinItems', true);
diff --git a/src/components/POLine/POLineForm.js b/src/components/POLine/POLineForm.js
index 97d32c6a8..437d13b9e 100644
--- a/src/components/POLine/POLineForm.js
+++ b/src/components/POLine/POLineForm.js
@@ -74,7 +74,7 @@ import styles from './POLineForm.css';
 import { createPOLDataFromInstance } from './Item/util';
 
 const GAME_CHANGER_FIELDS = ['isPackage', 'orderFormat', 'checkinItems', 'packagePoLineId', 'instanceId'];
-const GAME_CHANGER_TIMEOUT = 20;
+const GAME_CHANGER_TIMEOUT = 50;
 
 function POLineForm({
   form: { change, batch, getRegisteredFields },