diff --git a/CHANGELOG b/CHANGELOG
index bfcf54fab..9c1522249 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+KeePassDX(2.10.4)
+ * Hot fix to increase the opening speed of database #1028
+
 KeePassDX(2.10.3)
  * Improve Magikeyboard options description #1022 #1023 (Thx @djibux)
  * Fix database opened without notification (database is now closed when screen is killed in background #1025)
diff --git a/app/build.gradle b/app/build.gradle
index bc0a1c164..4816537a6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
         targetSdkVersion 30
-        versionCode = 81
-        versionName = "2.10.3"
+        versionCode = 82
+        versionName = "2.10.4"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt
index 8bf327e17..e64e3a20c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressDatabaseTaskProvider.kt
@@ -286,6 +286,11 @@ class ProgressDatabaseTaskProvider(private val activity: FragmentActivity) {
                           readOnly: Boolean,
                           cipherEntity: CipherDatabaseEntity?,
                           fixDuplicateUuid: Boolean) {
+        try {
+            activity.stopService(intentDatabaseTask)
+        } catch (e: Exception) {
+            Log.e(TAG, "Unable to stop the service", e)
+        }
         start(Bundle().apply {
             putParcelable(DatabaseTaskNotificationService.DATABASE_URI_KEY, databaseUri)
             putParcelable(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY, mainCredential)
diff --git a/fastlane/metadata/android/en-US/changelogs/82.txt b/fastlane/metadata/android/en-US/changelogs/82.txt
new file mode 100644
index 000000000..8e26df2c7
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/82.txt
@@ -0,0 +1 @@
+ * Hot fix to increase the opening speed of database #1028
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/82.txt b/fastlane/metadata/android/fr-FR/changelogs/82.txt
new file mode 100644
index 000000000..d7e453ddc
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/82.txt
@@ -0,0 +1 @@
+ * Correction pour augmenter la vitesse d'ouverture de la base de données #1028
\ No newline at end of file