diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.java b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.java
index f2dad238b72..3551d555dfc 100644
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.java
+++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.java
@@ -104,8 +104,10 @@ public class FingerprintEnrollEnrollingSfpsFragment extends Fragment {
     private ObjectAnimator mHelpAnimation;
     private int mIconTouchCount;
 
-    private final View.OnClickListener mOnSkipClickListener =
-            (v) -> mEnrollingViewModel.onCancelledDueToOnSkipPressed();
+    private final View.OnClickListener mOnSkipClickListener = v -> {
+        mEnrollingViewModel.setOnSkipPressed();
+        cancelEnrollment();
+    };
 
     private final Observer<EnrollmentProgress> mProgressObserver = progress -> {
         if (DEBUG) {
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java
index 40d571330d6..b5fe6094134 100644
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java
+++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java
@@ -95,8 +95,10 @@ public class FingerprintEnrollEnrollingUdfpsFragment extends Fragment {
 
     private int mRotation = -1;
 
-    private final View.OnClickListener mOnSkipClickListener =
-            (v) -> mEnrollingViewModel.onCancelledDueToOnSkipPressed();
+    private final View.OnClickListener mOnSkipClickListener = v -> {
+        mEnrollingViewModel.setOnSkipPressed();
+        cancelEnrollment();
+    };
 
     private final Observer<EnrollmentProgress> mProgressObserver = progress -> {
         if (progress != null) {