diff --git a/app/Http/Controllers/ClientPortal/QuoteController.php b/app/Http/Controllers/ClientPortal/QuoteController.php
index b5415bf01a11..39f2d5444da0 100644
--- a/app/Http/Controllers/ClientPortal/QuoteController.php
+++ b/app/Http/Controllers/ClientPortal/QuoteController.php
@@ -85,7 +85,9 @@ class QuoteController extends Controller
             ->get();
 
         if (! $quotes || $quotes->count() == 0) {
-            return;
+            return redirect()
+                ->route('client.quotes.index')
+                ->with('message', ctrans('texts.no_quotes_available_for_download'));
         }
 
         if ($quotes->count() == 1) {
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index aaf0f229a8aa..d9e3f3493455 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4279,6 +4279,7 @@ $LANG = array(
     'recurring_purchases' => 'Recurring purchases',
     'you_might_be_interested_in_following' => 'You might be interested in following',
     'quotes_with_status_sent_can_be_approved' => 'Only quotes with "Sent" status can be approved.',
+    'no_quotes_available_for_download' => 'No quotes available for download.',
 );
 
 return $LANG;
diff --git a/tests/Browser/ClientPortal/QuotesTest.php b/tests/Browser/ClientPortal/QuotesTest.php
index 189352be5f8d..b05c8992f506 100644
--- a/tests/Browser/ClientPortal/QuotesTest.php
+++ b/tests/Browser/ClientPortal/QuotesTest.php
@@ -93,4 +93,14 @@ class QuotesTest extends DuskTestCase
                 ->visitRoute('client.logout');
         });
     }
+
+    public function testNoQuotesAvailableForDownloadMessage()
+    {
+        $this->browse(function (Browser $browser) {
+            $browser
+                ->visitRoute('client.quotes.index')
+                ->press('Download')
+                ->assertSee('No quotes available for download.');
+        });
+    }
 }