diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index be0e04960a..10300ae00b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,11 +20,12 @@
     <!-- To be able to install APK from the application -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
+    <!--  Do not enable enableOnBackInvokedCallback until https://issuetracker.google.com/issues/271303558 is fixed -->
     <application
         android:name=".ElementXApplication"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
-        android:enableOnBackInvokedCallback="true"
+        android:enableOnBackInvokedCallback="false"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/changelog.d/1517.bugfix b/changelog.d/1517.bugfix
new file mode 100644
index 0000000000..263480f09f
--- /dev/null
+++ b/changelog.d/1517.bugfix
@@ -0,0 +1 @@
+Fix back button not working in bottom sheets.
\ No newline at end of file