diff --git a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js
index 2aaee87d58..f4e0895e4c 100644
--- a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js
+++ b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js
@@ -102,14 +102,14 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
 
     const lhcPeriodName = remoteLhcPeriodStatistics?.match({
         Success: (lhcPeriodStatistics) => lhcPeriodStatistics.lhcPeriod.name,
-        Other: () => '',
+        Other: () => spinner({ size: 1, absolute: false }),
     });
 
     return [
         h('.flex-row.justify-between.items-center.g2', [
             filtersPanelPopover(perLhcPeriodOverviewModel, activeColumns, { profile: 'runsPerLhcPeriod' }),
             h('.pl2#runOverviewFilter', runNumbersFilter(perLhcPeriodOverviewModel.filteringModel.get('runNumbers'))),
-            h('h2', ['Good physics runs of ', lhcPeriodName ?? spinner({ size: 1, absolute: false })]),
+            h('h2', ['Good physics runs of ', lhcPeriodName]),
             mcReproducibleAsNotBadToggle(
                 mcReproducibleAsNotBad,
                 () => perLhcPeriodOverviewModel.setMcReproducibleAsNotBad(!mcReproducibleAsNotBad),
diff --git a/test/public/runs/overview.test.js b/test/public/runs/overview.test.js
index 3b7cb97da4..d849cb686f 100644
--- a/test/public/runs/overview.test.js
+++ b/test/public/runs/overview.test.js
@@ -954,9 +954,9 @@ module.exports = () => {
             await page.waitForSelector(badFilterSelector);
             await page.$eval(badFilterSelector, (element) => element.click());
             await page.waitForSelector('tbody tr:nth-child(2)');
-            await page.waitForSelector(EXPORT_RUNS_TRIGGER_SELECTOR);
 
             ///// Download
+            await waitForButtonToBecomeActive(page, EXPORT_RUNS_TRIGGER_SELECTOR);
             await page.$eval(EXPORT_RUNS_TRIGGER_SELECTOR, (button) => button.click());
             await page.waitForSelector('#export-data-modal', { timeout: 5000 });
 
diff --git a/test/public/runs/runsPerLhcPeriod.overview.test.js b/test/public/runs/runsPerLhcPeriod.overview.test.js
index 273baca07d..77d1ec4a24 100644
--- a/test/public/runs/runsPerLhcPeriod.overview.test.js
+++ b/test/public/runs/runsPerLhcPeriod.overview.test.js
@@ -201,24 +201,19 @@ module.exports = () => {
         // Revert changes for next test
         await page.evaluate(() => {
             // eslint-disable-next-line no-undef
-            model.runs.perLhcPeriodOverviewModel.pagination.itemsPerPage = 10;
+            model.runs.perLhcPeriodOverviewModel.pagination.itemsPerPage = 2;
         });
-        await waitForTableLength(page, 4);
+        await waitForTableLength(page, 2);
     });
 
 
     it('should successfully export all runs per lhc Period', async () => {
-        await page.evaluate(() => {
-            // eslint-disable-next-line no-undef
-            model.runs.perLhcPeriodOverviewModel.pagination.itemsPerPage = 2;
-        });
-
         const targetFileName = 'data.json';
         await waitForButtonToBecomeActive(page, EXPORT_RUNS_TRIGGER_SELECTOR);
         // First export
         await pressElement(page, EXPORT_RUNS_TRIGGER_SELECTOR, true);
-        await page.waitForSelector('select.form-control', { timeout: 200 });
-        await page.waitForSelector('option[value=runNumber]', { timeout: 200 });
+        await page.waitForSelector('select.form-control');
+        await page.waitForSelector('option[value=runNumber]');
         await page.select('select.form-control', 'runQuality', 'runNumber', 'definition', 'lhcPeriod');
         await expectInnerText(page, '#send:enabled', 'Export');