diff --git a/lib/redux/reports/reports_state.dart b/lib/redux/reports/reports_state.dart
index e36e4d654..ea7335a3d 100644
--- a/lib/redux/reports/reports_state.dart
+++ b/lib/redux/reports/reports_state.dart
@@ -9,7 +9,7 @@ abstract class ReportsUIState
     implements Built<ReportsUIState, ReportsUIStateBuilder> {
   factory ReportsUIState() {
     return _$ReportsUIState._(
-      report: kReportActivity,
+      report: kReportClient,
       filters: BuiltMap<String, String>(),
     );
   }
diff --git a/lib/ui/reports/client_report.dart b/lib/ui/reports/client_report.dart
index d30a64bd9..ec793bc8a 100644
--- a/lib/ui/reports/client_report.dart
+++ b/lib/ui/reports/client_report.dart
@@ -23,7 +23,7 @@ ReportResult clientReport(UserCompanyEntity userCompany,
   final clientReportSettings =
       reportSettings != null && reportSettings.containsKey(kReportClient)
           ? reportSettings[kReportClient]
-          : null;
+          : ReportSettingsEntity();
 
   if (clientReportSettings != null) {
     columns = clientReportSettings.columns;
diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index a954caf51..66d98e0f6 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -11,6 +11,7 @@ import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
 import 'package:invoiceninja_flutter/ui/app/dialogs/multiselect_dialog.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
+import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart';
 import 'package:invoiceninja_flutter/ui/app/history_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/menu_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/reports/reports_screen_vm.dart';
@@ -36,6 +37,12 @@ class ReportsScreen extends StatelessWidget {
     final reportsUIState = state.uiState.reportsUIState;
     final reportResult = viewModel.reportResult;
 
+    final hasCustomDate = reportsUIState.filters.keys.where((column) {
+      final filter = reportsUIState.filters[column];
+      return getReportColumnType(column) == ReportColumnType.dateTime &&
+          filter == DateRange.custom.toString();
+    }).isNotEmpty;
+
     return WillPopScope(
       onWillPop: () async {
         store.dispatch(ViewDashboard(navigator: Navigator.of(context)));
@@ -79,19 +86,19 @@ class ReportsScreen extends StatelessWidget {
                   onChanged: (dynamic value) =>
                       viewModel.onSettingsChanged(report: value),
                   items: [
-                    kReportActivity,
-                    kReportAging,
+                    //kReportActivity,
+                    //kReportAging,
                     kReportClient,
-                    kReportCredit,
-                    kReportDocument,
-                    kReportExpense,
-                    kReportInvoice,
-                    kReportPayment,
-                    kReportProduct,
-                    kReportProfitAndLoss,
-                    kReportTask,
-                    kReportTaxRate,
-                    kReportQuote,
+                    //kReportCredit,
+                    //kReportDocument,
+                    //kReportExpense,
+                    //kReportInvoice,
+                    //kReportPayment,
+                    //kReportProduct,
+                    //kReportProfitAndLoss,
+                    //kReportTask,
+                    //kReportTaxRate,
+                    //kReportQuote,
                   ]
                       .map((report) => DropdownMenuItem(
                             value: report,
@@ -99,6 +106,13 @@ class ReportsScreen extends StatelessWidget {
                           ))
                       .toList(),
                 ),
+                if (hasCustomDate) ...[
+                  DatePicker(
+                    labelText: localization.startDate,
+                    //selectedDate: _settings.compareStartDate,
+                    //onSelected: (date) => _settings.compareStartDate = date,
+                  ),
+                ]
               ],
             ),
             Row(
@@ -423,8 +437,6 @@ class ReportAmount extends ReportElement {
 
   @override
   Widget renderWidget(BuildContext context, String column) {
-    print(
-        '## renderAmount: $column - COLUMN TYPE ${getReportColumnType(column)}');
     return Text(formatNumber(value, context,
         currencyId: currencyId, formatNumberType: formatNumberType));
   }