diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 88211fede7..7495cdbcfb 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -910,14 +910,18 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         a.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
-                setWindowInsetsAnimationCallback(null);
+                if (Utilities.ATLEAST_R) {
+                    setWindowInsetsAnimationCallback(null);
+                }
                 mIsAnimatingClosed = true;
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
                 if (mKeyboardInsetAnimationCallback != null) {
-                    setWindowInsetsAnimationCallback(mKeyboardInsetAnimationCallback);
+                    if (Utilities.ATLEAST_R) {
+                        setWindowInsetsAnimationCallback(mKeyboardInsetAnimationCallback);
+                    }
                 }
                 closeComplete(true);
                 announceAccessibilityChanges();