diff --git a/src/components/ExportButton/ExportButton.js b/src/components/ExportButton/ExportButton.js
index d177b7458..5a8fb139e 100644
--- a/src/components/ExportButton/ExportButton.js
+++ b/src/components/ExportButton/ExportButton.js
@@ -91,23 +91,18 @@ function ExportButton({
           return;
         }
 
-        let templateValues = {};
+        let templateValues;
         let imageUrl;
-        let fileName = `trafimage-${new Date().toISOString().slice(0, 10)}.pdf`;
+        let fileName;
 
         const { exportConfig } = topic;
         if (exportConfig) {
           const { getTemplateValues, getOverlayImageUrl, getExportFileName } =
             exportConfig;
-          templateValues = getTemplateValues
-            ? getTemplateValues(i18n.language, t)
-            : {};
-          imageUrl =
-            getOverlayImageUrl &&
-            getOverlayImageUrl(i18n.language, exportFormat);
-          fileName = getExportFileName
-            ? getExportFileName(t, exportFormat, i18n.language)
-            : fileName;
+          templateValues = getTemplateValues?.(i18n.language, t);
+          imageUrl = getOverlayImageUrl?.(i18n.language, exportFormat);
+          fileName =
+            getExportFileName?.(t, exportFormat, i18n.language) || fileName;
         }
 
         const scaleLineControl = mapToExport
diff --git a/src/utils/exportUtils.js b/src/utils/exportUtils.js
index b82ff4bfe..61625c902 100644
--- a/src/utils/exportUtils.js
+++ b/src/utils/exportUtils.js
@@ -328,9 +328,9 @@ export const exportPdf = async (
   canvas,
   exportScale,
   exportSize,
-  templateValues,
+  templateValues = {},
   overlayImageUrl,
-  exportFileName,
+  exportFileName = `trafimage-${new Date().toISOString().slice(0, 10)}.pdf`,
   scaleLineConfig,
 ) => {
   clean(mapToExport, map, new LayerService(layers));