diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
index c46de2fb7..0121bd77b 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
@@ -43,7 +43,7 @@ public class DatabaseModule {
   @Singleton
   public SqlCipherDatabaseSource provideSqlCipherDatabaseSource(@NonNull final Context context) {
     return new SqlCipherDatabaseSource(context, Models.DEFAULT,
-        context.getResources().getString(R.string.nc_legacy_database_name).toLowerCase()
+        context.getResources().getString(R.string.nc_app_name).toLowerCase()
             .replace(" ", "_").trim() + ".sqlite",
         context.getString(R.string.nc_talk_database_encryption_key), 6);
   }
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 89d57eda5..ddfeb9157 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -23,7 +23,6 @@
     <!-- Set before a release -->
     <string name="nc_talk_database_encryption_key" translatable="false">HvAfHtAy/QdFYqAWFFXa1VV_Iv6ZQ1.tf5swMc^45wS_vz=Wm[oyRP5D-</string>
     <string name="nc_talk_login_scheme" translatable="false">nc</string>
-    <string name="nc_legacy_database_name">Nextcloud Talk</string>
     <bool name="nc_is_debug">false</bool>
 
     <!-- App label shown on the home screen -->