diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca213527a3..bf8ebd605c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file. The format
 
 ## Unreleased
 
+## Frontend
+
+- Fixed:
+
+  - Improved UX for the Building Selection Criteria drawer ([#1994](https://github.com/bloom-housing/bloom/pull/1994)) (Jared White)
+
 ## v2.0.0-pre-tailwind 09/16/2021
 
 ## Frontend
diff --git a/sites/partners/src/listings/PaperListingForm/sections/BuildingSelectionCriteria.tsx b/sites/partners/src/listings/PaperListingForm/sections/BuildingSelectionCriteria.tsx
index 2014ae3574..117ab5a9af 100644
--- a/sites/partners/src/listings/PaperListingForm/sections/BuildingSelectionCriteria.tsx
+++ b/sites/partners/src/listings/PaperListingForm/sections/BuildingSelectionCriteria.tsx
@@ -42,6 +42,7 @@ const LotteryResults = () => {
       id: "",
       url: "",
     })
+    setValue("criteriaAttachType", null)
     setDrawerState(false)
   }
 
@@ -220,13 +221,16 @@ const LotteryResults = () => {
           <Button
             key={0}
             onClick={() => {
-              const value = getValues("buildingSelectionCriteriaURL")
-              if (value) {
-                deletePDF()
-                saveURL(value)
-              } else {
-                deleteURL()
-                savePDF()
+              // Only try to save values if an attachment type has been selected
+              if (criteriaAttachType) {
+                const value = getValues("buildingSelectionCriteriaURL")
+                if (value) {
+                  deletePDF()
+                  saveURL(value)
+                } else {
+                  deleteURL()
+                  savePDF()
+                }
               }
               resetDrawerState()
             }}