diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php
index 69377705b7a8..c20bfb3d346d 100644
--- a/app/Repositories/ActivityRepository.php
+++ b/app/Repositories/ActivityRepository.php
@@ -71,7 +71,7 @@ class ActivityRepository extends BaseRepository
      */
     public function createBackup($entity, $activity)
     {
-        if ($entity instanceof User || $entity->company->is_disabled) {
+        if ($entity instanceof User || $entity->company->is_disabled || $entity->company?->account->isFreeHostedClient()) {
             return;
         }
 
diff --git a/config/ninja.php b/config/ninja.php
index b884094d0872..25d08f0da55a 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -43,7 +43,10 @@ return [
     'preconfigured_install' => env('PRECONFIGURED_INSTALL', false),
     'update_secret' => env('UPDATE_SECRET', ''),
     // Settings used by invoiceninja.com
-
+    'disks' => [
+        'backup' => env('BACKUP_DISK', 's3'),
+        'document' => env('DOCUMENT_DISK', 's3'),
+    ],
     'terms_of_service_url' => [
         'hosted' => env('TERMS_OF_SERVICE_URL', 'https://www.invoiceninja.com/terms/'),
         'selfhost' => env('TERMS_OF_SERVICE_URL', 'https://www.invoiceninja.com/self-hosting-terms-service/'),