diff --git a/gxoffice/src/main/java/com/genexus/gxoffice/ExcelDoc.java b/gxoffice/src/main/java/com/genexus/gxoffice/ExcelDoc.java
index 810e1b0af..1abfd7de1 100644
--- a/gxoffice/src/main/java/com/genexus/gxoffice/ExcelDoc.java
+++ b/gxoffice/src/main/java/com/genexus/gxoffice/ExcelDoc.java
@@ -56,9 +56,11 @@ public IExcelDocument getDocument() {
 	public void checkExcelDocument() {
 		if (document == null) {
 			try {
-				if (excelFileName.endsWith(".xlsx") || excelFileName.endsWith(".xlsm")
-						|| excelFileName.endsWith(".xlsb") || excelFileName.endsWith(".xlam")
-						|| isXlsx(excelFileName)) {
+				if (excelFileName.endsWith(".xls") || excelFileName.endsWith(".xlm")
+						|| excelFileName.endsWith(".xlb") || excelFileName.endsWith(".xlm")) {
+					Class.forName("org.apache.poi.hssf.usermodel.HSSFWorkbook");
+					document = new com.genexus.gxoffice.poi.hssf.ExcelDocument();
+				} else {
 					if (bufferedStreaming) {
 						Class.forName("org.apache.poi.xssf.streaming.SXSSFWorkbook");
 						document = new com.genexus.gxoffice.poi.sxssf.ExcelDocument();
@@ -66,9 +68,6 @@ public void checkExcelDocument() {
 						Class.forName("org.apache.poi.xssf.usermodel.XSSFWorkbook");
 						document = new com.genexus.gxoffice.poi.xssf.ExcelDocument();
 					}
-				} else {
-					Class.forName("org.apache.poi.hssf.usermodel.HSSFWorkbook");
-					document = new com.genexus.gxoffice.poi.hssf.ExcelDocument();
 				}
 			} catch (Throwable e) {
 				document = new com.genexus.gxoffice.ExcelDocument();