diff --git a/app/controllers/idv/address_controller.rb b/app/controllers/idv/address_controller.rb
index 4b13fc9ea2d..b8b1428fa03 100644
--- a/app/controllers/idv/address_controller.rb
+++ b/app/controllers/idv/address_controller.rb
@@ -20,7 +20,6 @@ def update
       @address_form = build_address_form
       form_result = @address_form.submit(profile_params)
       track_submit_event(form_result)
-      capture_address_edited(form_result)
       if form_result.success?
         success
       else
@@ -69,8 +68,11 @@ def failure
     end
 
     def track_submit_event(form_result)
-      address_edited = form_result.success? && address_edited?
-      analytics.idv_address_submitted(**form_result.to_h.merge(address_edited:))
+      analytics.idv_address_submitted(
+        **form_result.to_h.merge(
+          address_edited: address_edited?,
+        ),
+      )
     end
 
     def address_edited?
@@ -80,10 +82,5 @@ def address_edited?
     def profile_params
       params.require(:idv_form).permit(Idv::AddressForm::ATTRIBUTES)
     end
-
-    def capture_address_edited(result)
-      address_edited = result.to_h[:address_edited]
-      idv_session.address_edited = true if address_edited
-    end
   end
 end
diff --git a/app/forms/idv/address_form.rb b/app/forms/idv/address_form.rb
index f0fc685c993..db960b5571d 100644
--- a/app/forms/idv/address_form.rb
+++ b/app/forms/idv/address_form.rb
@@ -30,6 +30,8 @@ def submit(params)
     end
 
     def updated_user_address
+      return nil unless valid?
+
       Pii::Address.new(
         address1: address1,
         address2: address2,