diff --git a/src/OSPSuite.Infrastructure.Import/Core/DataSheet.cs b/src/OSPSuite.Infrastructure.Import/Core/DataSheet.cs
index e0873b3ca..82bbbb21b 100644
--- a/src/OSPSuite.Infrastructure.Import/Core/DataSheet.cs
+++ b/src/OSPSuite.Infrastructure.Import/Core/DataSheet.cs
@@ -179,8 +179,6 @@ public void RemoveEmptyRows()
          {
             if (_rawDataTable[i].All(x => x.IsNullOrEmpty()))
                _rawDataTable.RemoveAt(i);
-            else
-               break;
          }
       }
 
diff --git a/tests/OSPSuite.Presentation.Tests/Data/IntegrationSampleUnitFromColumn.xlsx b/tests/OSPSuite.Presentation.Tests/Data/IntegrationSampleUnitFromColumn.xlsx
index 3d5aeeb50..07595214d 100644
Binary files a/tests/OSPSuite.Presentation.Tests/Data/IntegrationSampleUnitFromColumn.xlsx and b/tests/OSPSuite.Presentation.Tests/Data/IntegrationSampleUnitFromColumn.xlsx differ
diff --git a/tests/OSPSuite.Presentation.Tests/Importer/Presenters/ImporterPresenterSpecs.cs b/tests/OSPSuite.Presentation.Tests/Importer/Presenters/ImporterPresenterSpecs.cs
index 0ad88f055..2ca473dac 100644
--- a/tests/OSPSuite.Presentation.Tests/Importer/Presenters/ImporterPresenterSpecs.cs
+++ b/tests/OSPSuite.Presentation.Tests/Importer/Presenters/ImporterPresenterSpecs.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using FakeItEasy;
 using OSPSuite.BDDHelper;
@@ -12,6 +13,7 @@
 using OSPSuite.Core.Services;
 using OSPSuite.Helpers;
 using OSPSuite.Infrastructure.Import.Core;
+using OSPSuite.Infrastructure.Import.Core.DataSourceFileReaders;
 using OSPSuite.Infrastructure.Import.Core.Exceptions;
 using OSPSuite.Infrastructure.Import.Core.Mappers;
 using OSPSuite.Infrastructure.Import.Services;
@@ -208,6 +210,31 @@ public void sets_column_mapping_presenter_settings()
       }
    }
 
+   public class When_setting_data_source_with_empty_rows : concern_for_ImporterPresenter
+   {
+      protected Cache<string, DataSheet> _sheets;
+
+      protected override void Context()
+      {
+         base.Context();
+         _sheets = new Cache<string, DataSheet>();
+         _sheets.Add("Sheet1", A.Fake<DataSheet>());
+
+         _dataSourceFile = new ExcelDataSourceFile(A.Fake<IImportLogger>());
+         _dataSourceFile.Format = A.Fake<IDataFormat>();
+         _dataSourceFile.Path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data", "IntegrationSampleUnitFromColumn.xlsx");
+         A.CallTo(() => _importerDataPresenter.SetDataSource(A<string>.Ignored)).Returns(_dataSourceFile);
+         _importerDataPresenter.OnImportSheets += Raise.With(new ImportSheetsEventArgs()
+            { Filter = "", DataSourceFile = _dataSourceFile, SheetNames = _sheets.Keys.ToList() });
+      }
+
+      [Observation]
+      public void should_not_throw_an_ImporterParsingException()
+      {
+         sut.LoadConfiguration(_importerConfiguration, "");
+      }
+   }
+
    public class When_import_data : concern_for_ImporterPresenter
    {
       protected bool triggered = false;