diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index b0da6a04b5f5..a2507496ecf7 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -274,7 +274,7 @@ class Helpers
     public static function resolveFont(string $font = 'Arial'): array
     {
         return $font
-            ? ['name' => $font, 'url' => sprintf('https://fonts.googleapis.com/css2?family=%s&display=swap', $font)]
+            ? ['name' => str_replace('_', ' ', $font), 'url' => sprintf('https://fonts.googleapis.com/css2?family=%s&display=swap', str_replace('_', '+', $font))]
             : ['name' => 'Arial', 'url' => ''];
     }
 }
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 4b64aa4d7e1e..e165c5102bfd 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -445,8 +445,8 @@ class HtmlEngine
         $data['_rate3'] = ['value' => '', 'label' => ctrans('texts.tax')];
 
         $data['$font_size'] = ['value' => $this->settings->font_size . 'px', 'label' => ''];
-        $data['$font_name'] = ['value' => Helpers::resolveFont()['name'], 'label' => ''];
-        $data['$font_url'] = ['value' => Helpers::resolveFont()['url'], 'label' => ''];
+        $data['$font_name'] = ['value' => Helpers::resolveFont($this->settings->primary_font)['name'], 'label' => ''];
+        $data['$font_url'] = ['value' => Helpers::resolveFont($this->settings->primary_font)['url'], 'label' => ''];
 
         $data['$invoiceninja.whitelabel'] = ['value' => 'https://raw.githubusercontent.com/invoiceninja/invoiceninja/v5-develop/public/images/new_logo.png', 'label' => ''];