diff --git a/app/Providers/ScoutServiceProvider.php b/app/Providers/ScoutServiceProvider.php
new file mode 100644
index 0000000000..3841ee22fd
--- /dev/null
+++ b/app/Providers/ScoutServiceProvider.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2025. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Laravel\Scout\ScoutServiceProvider as BaseScoutServiceProvider;
+
+class ScoutServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        // Only register Scout if driver is not null
+        if (config('scout.driver') !== 'null') {
+            $this->app->register(BaseScoutServiceProvider::class);
+        }
+    }
+
+    /**
+     * Bootstrap services.
+     */
+    public function boot(): void
+    {
+        // Scout will be booted automatically by the base provider if driver is not null
+    }
+}
diff --git a/config/app.php b/config/app.php
index 0f72ae3399..49134abad7 100644
--- a/config/app.php
+++ b/config/app.php
@@ -200,6 +200,7 @@ return [
         App\Providers\ClientPortalServiceProvider::class,
         App\Providers\NinjaTranslationServiceProvider::class,
         App\Providers\StaticServiceProvider::class,
+        App\Providers\ScoutServiceProvider::class,
     ],
 
     /*