diff --git a/gulp/DefaultSpecs.js b/gulp/DefaultSpecs.js
index 44d2f2bd..8bcbf64f 100644
--- a/gulp/DefaultSpecs.js
+++ b/gulp/DefaultSpecs.js
@@ -19,7 +19,7 @@ const constants = {
 
 // Store the default project specifications
 const specs = {
-	version: '2.17.0',
+	version: '2.18.0',
 	name: 'OutSystems DataGrid',
 	description: '',
 	url: 'Website:\n • ' + constants.websiteUrl,
diff --git a/package.json b/package.json
index 9079fa56..2e63e832 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "outsystems-datagrid",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "OutSystems Data Grid for Reactive Web",
   "author": "UI Components Team",
   "license": "BSD-3-Clause",
diff --git a/src/OSFramework/DataGrid/Constants.ts b/src/OSFramework/DataGrid/Constants.ts
index 826a6ea3..df524757 100644
--- a/src/OSFramework/DataGrid/Constants.ts
+++ b/src/OSFramework/DataGrid/Constants.ts
@@ -1,7 +1,7 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 namespace OSFramework.DataGrid.Constants {
 	/* OutSystems Data Grid Version */
-	export const OSDataGridVersion = '2.17.0';
+	export const OSDataGridVersion = '2.18.0';
 	/* OutSystems null values */
 	export const OSNullDate = '1900-01-01';
 	export const OSNullDateTime = '1900-01-01T00:00:00';
diff --git a/src/Providers/DataGrid/Wijmo/Features/ToolTip.ts b/src/Providers/DataGrid/Wijmo/Features/ToolTip.ts
index 8e4cde6e..37d9ff5f 100644
--- a/src/Providers/DataGrid/Wijmo/Features/ToolTip.ts
+++ b/src/Providers/DataGrid/Wijmo/Features/ToolTip.ts
@@ -32,8 +32,14 @@ namespace Providers.DataGrid.Wijmo.Feature {
 					this._setCellTooltip(_currTarget, ht.getColumn().binding, ht.row);
 				}
 			} else if (cellType === wijmo.grid.CellType.ColumnHeader) {
-				// If the Column Header is from a Group Column, we need to use a different approach that the regular header
-				if (_currTarget.classList.contains(Helper.Constants.CssClasses.ColumnGroup)) {
+				const col = ht.getColumn(true) as wijmo.grid.ColumnGroup;
+				// If the Column Header is from a Group Column, we need to use a different approach than the regular header
+				// We can check if the current target is a ColumnGroup by checking its class and if it has columns or columnGroups
+				if (
+					_currTarget.classList.contains(Helper.Constants.CssClasses.ColumnGroup) &&
+					((col._binding === undefined && col.columns !== undefined && col.columns.length > 0) ||
+						(col.columnGroups !== undefined && col.columnGroups.length > 0))
+				) {
 					this._setColumnGroupHeaderTooltip(_currTarget);
 				} else {
 					this._setHeaderTooltip(_currTarget, ht);