diff --git a/src/Controller/HandlePdfController.php b/src/Controller/HandlePdfController.php
index 94c81c2acc443f973217436efcfa96e8a30e1957..2e2eb87718add25d579cf45779a518a9b36aa212 100644
--- a/src/Controller/HandlePdfController.php
+++ b/src/Controller/HandlePdfController.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\fillpdf\Controller;
 
+use Drupal\Core\Url;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\file\Entity\File;
 use Drupal\file\FileInterface;
@@ -126,7 +127,7 @@ class HandlePdfController extends ControllerBase {
     $fillpdf_form = FillPdfForm::load($context['fid']);
     if (!$fillpdf_form) {
       $this->messenger->addError($this->t('FillPDF Form (fid) not found in the system. Please check the value in your FillPDF Link.'));
-      return new RedirectResponse('/');
+      return new RedirectResponse(Url::fromRoute('<front>')->toString());
     }
 
     $fields = $fillpdf_form->getFormFields();
diff --git a/src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php b/src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php
index b908a64a89f9782641fd29c61694bde6b4b43368..4dc475d22366091a3707b40b80dc7e9dafb6446d 100644
--- a/src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php
+++ b/src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\fillpdf\Plugin\FillPdfActionPlugin;
 
+use Drupal\Core\Url;
 use Drupal\fillpdf\OutputHandler;
 use Drupal\fillpdf\Plugin\FillPdfActionPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -68,7 +69,7 @@ class FillPdfSaveAction extends FillPdfActionPluginBase {
     $this->savePdf();
 
     // @todo: Fix based on value of post_save_redirect, once I add that
-    $response = new RedirectResponse('/');
+    $response = new RedirectResponse(Url::fromRoute('<front>')->toString());
     return $response;
   }