diff --git a/src/modules/backups/backup.usecase.spec.ts b/src/modules/backups/backup.usecase.spec.ts
index 919fe48de..a1d9b9320 100644
--- a/src/modules/backups/backup.usecase.spec.ts
+++ b/src/modules/backups/backup.usecase.spec.ts
@@ -511,9 +511,6 @@ describe('BackupUseCase', () => {
         ...createDeviceDto,
         userId: userWithoutBackups.id,
       });
-      jest
-        .spyOn(backupUseCase, 'activate')
-        .mockResolvedValue({ backupsBucket: 'new-bucket' });
       jest
         .spyOn(backupRepository, 'findConflictingUserDevice')
         .mockResolvedValue(null);
@@ -529,7 +526,10 @@ describe('BackupUseCase', () => {
         createDeviceDto,
       );
 
-      expect(backupUseCase.activate).toHaveBeenCalledWith(userWithoutBackups);
+      expect(backupUseCase.createDeviceAsFolder).toHaveBeenCalledWith(
+        userWithoutBackups,
+        createDeviceDto.name,
+      );
       expect(result).toEqual({ ...mockDevice, folder: mockFolder });
     });
 
diff --git a/src/modules/backups/backup.usecase.ts b/src/modules/backups/backup.usecase.ts
index c1f6d6fc8..60d977db6 100644
--- a/src/modules/backups/backup.usecase.ts
+++ b/src/modules/backups/backup.usecase.ts
@@ -248,10 +248,6 @@ export class BackupUseCase {
       throw new BadRequestException('You need to send either hostname or key');
     }
 
-    if (!user.hasBackupsEnabled()) {
-      await this.activate(user);
-    }
-
     await this.verifyDeviceDoesNotExist(user, {
       key: createDeviceDto.key,
       platform: createDeviceDto.platform,