diff --git a/force-app/main/default/classes/OD_DatatableRecordsControllerTest.cls b/force-app/main/default/classes/OD_DatatableRecordsControllerTest.cls
index 0bc7a5d..32706d9 100644
--- a/force-app/main/default/classes/OD_DatatableRecordsControllerTest.cls
+++ b/force-app/main/default/classes/OD_DatatableRecordsControllerTest.cls
@@ -171,7 +171,7 @@ public class OD_DatatableRecordsControllerTest {
       true,
       'Contact',
       'FirstName,LastName',
-      '[{"LastName": "Created 1"},{"LastName": "Created 2"}]',
+      '[{"LastName": "Created 1", "FirstName": "Test 1"},{"LastName": "Created 2", "FirstName": "Test 2"}]',
       '[{ "Id": "' + contacts[0].Id + '", "LastName": "LastName Updated"}]',
       '[{ "Id": "' + contacts[1].Id + '"}]',
       false
@@ -199,7 +199,7 @@ public class OD_DatatableRecordsControllerTest {
         true,
         null,
         'FirstName,LastName',
-        '[{"LastName": "Created 1"},{"LastName": "Created 2"}]',
+        '[{"LastName": "Created 1", "FirstName": "Test 1"},{"LastName": "Created 2", "FirstName": "Test 2"}]',
         '[{ "Id": "' + contacts[0].Id + '", "LastName": "LastName Updated"}]',
         '[{ "Id": "' + contacts[1].Id + '"}]',
         false
@@ -543,7 +543,7 @@ public class OD_DatatableRecordsControllerTest {
       false,
       'Contact',
       'FirstName,LastName',
-      '[{"LastName": "Created 1"},{"LastName": "Created 2"}]',
+      '[{"LastName": "Created 1", "FirstName": "Test 1"},{"LastName": "Created 2", "FirstName": "Test 2"}]',
       '[{ "Id": "' + contacts[0].Id + '", "LastName": "LastName Updated"}]',
       '[{ "Id": "' + contacts[1].Id + '"}]',
       false
@@ -571,7 +571,7 @@ public class OD_DatatableRecordsControllerTest {
         false,
         null,
         'FirstName,LastName',
-        '[{"LastName": "Created 1"},{"LastName": "Created 2"}]',
+        '[{"LastName": "Created 1", "FirstName": "Test 1"},{"LastName": "Created 2", "FirstName": "Test 2"}]',
         '[{ "Id": "' + contacts[0].Id + '", "LastName": "LastName Updated"}]',
         '[{ "Id": "' + contacts[1].Id + '"}]',
         false
@@ -761,4 +761,4 @@ public class OD_DatatableRecordsControllerTest {
 
     Test.stopTest();
   }
-}
\ No newline at end of file
+}
diff --git a/force-app/main/default/lwc/odDatatable/odDatatable.html b/force-app/main/default/lwc/odDatatable/odDatatable.html
index 9982f58..17b05bb 100644
--- a/force-app/main/default/lwc/odDatatable/odDatatable.html
+++ b/force-app/main/default/lwc/odDatatable/odDatatable.html
@@ -35,7 +35,7 @@
     </template>
 
     <!-- Table or no records message -->
-    <template lwc:if={tableData.length}>
+    <template lwc:if={displayTableData}>
       <c-od-datatable-custom
         key-field="_id"
         class="od-datatable"
diff --git a/force-app/main/default/lwc/odDatatable/odDatatable.js b/force-app/main/default/lwc/odDatatable/odDatatable.js
index 0c50eb6..81eafef 100644
--- a/force-app/main/default/lwc/odDatatable/odDatatable.js
+++ b/force-app/main/default/lwc/odDatatable/odDatatable.js
@@ -66,6 +66,7 @@ export default class ODDatatable extends LightningElement {
   @api objectName;
   @api columns;
   @api noRecordsMessage;
+  @api displayNoRecordsMessage;
   @api showRowNumberColumn;
 
   // sharing
@@ -598,6 +599,11 @@ export default class ODDatatable extends LightningElement {
     return result;
   }
 
+  @api
+  get displayTableData() {
+    return (!this.displayNoRecordsMessage.value || this._tableData?.length);
+  }
+
   get isFirstPage() {
     return this.currentPage === 0;
   }
diff --git a/force-app/main/default/lwc/odDatatable/odDatatable.js-meta.xml b/force-app/main/default/lwc/odDatatable/odDatatable.js-meta.xml
index 9ad18cb..b8ff2d2 100644
--- a/force-app/main/default/lwc/odDatatable/odDatatable.js-meta.xml
+++ b/force-app/main/default/lwc/odDatatable/odDatatable.js-meta.xml
@@ -21,6 +21,7 @@
         name="tableData"
         label="Data Source Record Collection"
         type="{T[]}"
+        role="inputOnly"
         description="Record Collection variable containing the records to display in the datatable. This is mutated by add/edit/delete"
       />
             <property
@@ -39,6 +40,14 @@
         role="inputOnly"
         default="No Records Found"
         description="Message to display instead of the datatable if there are no records."
+      />
+            <property
+        name="displayNoRecordsMessage"
+        label="Show No Records Message"
+        type="String"
+        role="inputOnly"
+        default="Yes"
+        description="Display No Record Message instead of the datatable if there are no records."
       />
             <property
         name="canAdd"
diff --git a/force-app/main/default/lwc/odDatatableConfigurationEditor/odDatatableConfigurationEditor.html b/force-app/main/default/lwc/odDatatableConfigurationEditor/odDatatableConfigurationEditor.html
index 2402d63..01508e7 100644
--- a/force-app/main/default/lwc/odDatatableConfigurationEditor/odDatatableConfigurationEditor.html
+++ b/force-app/main/default/lwc/odDatatableConfigurationEditor/odDatatableConfigurationEditor.html
@@ -88,6 +88,19 @@ <h1 class="slds-text-color_inverse slds-text-heading_medium slds-p-around--small
         help-text={inputValues.noRecordsMessage.helpText}
       >
       </c-od-datatable-input-generic>
+      <c-od-datatable-input-generic
+        field-name="displayNoRecordsMessage"
+        type={inputValues.displayNoRecordsMessage.type}
+        editable
+        toggle-value-active={yesNo.YES}
+        toggle-value-inactive={yesNo.NO}
+        class="slds-size--1-of-1"
+        value={inputValues.displayNoRecordsMessage.value}
+        label={inputValues.displayNoRecordsMessage.label}
+        onupdatefield={handleInputChange}
+        help-text={inputValues.displayNoRecordsMessage.helpText}
+      >
+      </c-od-datatable-input-generic>
       <c-od-datatable-input-generic
         field-name="showRowNumberColumn"
         type={inputValues.showRowNumberColumn.type}
diff --git a/force-app/main/default/lwc/odDatatableConfigurationEditor/odDatatableConfigurationEditor.js b/force-app/main/default/lwc/odDatatableConfigurationEditor/odDatatableConfigurationEditor.js
index cbeac2b..4c086b3 100644
--- a/force-app/main/default/lwc/odDatatableConfigurationEditor/odDatatableConfigurationEditor.js
+++ b/force-app/main/default/lwc/odDatatableConfigurationEditor/odDatatableConfigurationEditor.js
@@ -136,6 +136,13 @@ export default class OdConfigurationEditor extends LightningElement {
       value: 'No Records Found',
       helpText: 'Message to display instead of the datatable if there are no records.',
     },
+    displayNoRecordsMessage: {
+      label: 'Display No Records Message',
+      type: FIELD_TYPES.TOGGLE,
+      valueType: FIELD_TYPES.STRING,
+      value: YES_NO.YES,
+      helpText: 'Display No Records Message instead of the datatable if there are no records.',
+    },
     canAdd: {
       label: 'Can Add?',
       type: FIELD_TYPES.TOGGLE,
diff --git a/force-app/main/default/lwc/odDatatablePreview/odDatatablePreview.html b/force-app/main/default/lwc/odDatatablePreview/odDatatablePreview.html
index 05e4969..8f7a33c 100644
--- a/force-app/main/default/lwc/odDatatablePreview/odDatatablePreview.html
+++ b/force-app/main/default/lwc/odDatatablePreview/odDatatablePreview.html
@@ -6,6 +6,7 @@
       table-data={dummyData}
       columns={configuration.columns.value}
       no-records-message={configuration.noRecordsMessage.value}
+      display-no-records-message={configuration.displayNoRecordsMessage.value}
       show-row-number-column={configuration.showRowNumberColumn.value}
       is-master-detail={configuration.isMasterDetail.value}
       master-detail-configuration={configuration.masterDetailConfiguration.value}
diff --git a/force-app/main/default/lwc/odDatatableRelatedList/odDatatableRelatedList.html b/force-app/main/default/lwc/odDatatableRelatedList/odDatatableRelatedList.html
index 6c06251..ea864d8 100644
--- a/force-app/main/default/lwc/odDatatableRelatedList/odDatatableRelatedList.html
+++ b/force-app/main/default/lwc/odDatatableRelatedList/odDatatableRelatedList.html
@@ -8,6 +8,7 @@
       table-data={data}
       columns={columns}
       no-records-message={noRecordsMessage}
+      display-no-records-message={displayNoRecordsMessage}
       show-row-number-column={showRowNumberColumn}
       is-master-detail="Yes"
       master-detail-configuration={masterDetailConfiguration}
diff --git a/force-app/main/default/lwc/odDatatableRelatedList/odDatatableRelatedList.js b/force-app/main/default/lwc/odDatatableRelatedList/odDatatableRelatedList.js
index 25525cc..b17793a 100644
--- a/force-app/main/default/lwc/odDatatableRelatedList/odDatatableRelatedList.js
+++ b/force-app/main/default/lwc/odDatatableRelatedList/odDatatableRelatedList.js
@@ -107,6 +107,10 @@ export default class OdDatatableRelatedList extends LightningElement {
     return this._configuration.noRecordsMessage ? this._configuration.noRecordsMessage.value : '';
   }
 
+  get displayNoRecordsMessage() {
+    return this._configuration.displayNoRecordsMessage ? this._configuration.displayNoRecordsMessage.value : YES_NO.YES;
+  }
+
   get showRowNumberColumn() {
     return this._configuration.showRowNumberColumn ? this._configuration.showRowNumberColumn.value : YES_NO.NO;
   }