diff --git a/src/components/crud/grid/GridDatatable.js b/src/components/crud/grid/GridDatatable.js
index fd350bfa..69363483 100644
--- a/src/components/crud/grid/GridDatatable.js
+++ b/src/components/crud/grid/GridDatatable.js
@@ -54,7 +54,7 @@ export const GridDatabase = props => {
             ? { onSelectedRowsChange: props.onSelectedRowsChange }
             : {})}
           conditionalRowStyles={props.conditionalRowStyles}
-          expandableRows
+          expandableRows={props.FlightInfoComponent ? true : false}
           expandableRowsComponent={props.FlightInfoComponent}
         />
       </div>