diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index 0ca4492b..31389f3a 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -551,11 +551,6 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
     // Should really create welcome and statistics here, but they need redoing later anyway to kill off webkit
     ui->tabWidget->setCurrentIndex(AppSetting->openTabAtStart());
 
-    QDate first = p_profile->FirstDay();
-    QDate last = p_profile->LastDay();
-    p_profile->general->setStatReportRangeStart(first);
-    p_profile->general->setStatReportRangeEnd(last);
-    p_profile->general->setStatReportDate(last);
     p_profile->general->setStatReportMode(STAT_MODE_STANDARD);
     GenerateStatistics();
     PopulatePurgeMenu();
@@ -2431,6 +2426,7 @@ void MainWindow::init_reportModeUi()
 
 void MainWindow::reset_reportModeUi()
 {
+    Statistics::updateReportDate();
     int mode = STAT_MODE_STANDARD;
     ui->statStartDate->blockSignals(true);
     ui->statEndDate->blockSignals(true);
@@ -2443,9 +2439,6 @@ void MainWindow::reset_reportModeUi()
         ui->statStartDate->setMaximumDate(last);
         ui->statEndDate->setMinimumDate(first);
         ui->statEndDate->setMaximumDate(last);
-        if (!p_profile->general->statReportDate().isValid()) {
-            p_profile->general->setStatReportDate(last);
-        }
     }
     switch (mode) {
         default:
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 1799fc17..bc433317 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -26,6 +26,7 @@
 #include "cprogressbar.h"
 #include "SleepLib/common.h"
 #include "version.h"
+#include "SleepLib/profiles.h"
 
 extern MainWindow *mainwin;
 
@@ -1893,3 +1894,18 @@ QString StatisticsRow::value(QDate start, QDate end)
 
     return value;
 }
+
+QDate lastdate;
+QDate firstdate;
+void Statistics::updateReportDate() {
+    if (p_profile) {
+        QDate last = p_profile->LastDay();
+        QDate first = p_profile->FirstDay();
+        if (last == lastdate  && first == firstdate) return;
+        p_profile->general->setStatReportRangeStart(first);
+        p_profile->general->setStatReportRangeEnd(last);
+        p_profile->general->setStatReportDate(last);
+        lastdate = last;
+        firstdate = first;
+    }
+}
diff --git a/oscar/statistics.h b/oscar/statistics.h
index f4bb1fe4..799378d6 100644
--- a/oscar/statistics.h
+++ b/oscar/statistics.h
@@ -211,6 +211,8 @@ class Statistics : public QObject
 
     void updateDisabledInfo();
 
+    static void updateReportDate();
+
   protected:
     void loadRXChanges();
     void saveRXChanges();
diff --git a/oscar/test_macros.h b/oscar/test_macros.h
index 2a267fd3..401fc0ec 100644
--- a/oscar/test_macros.h
+++ b/oscar/test_macros.h
@@ -43,6 +43,8 @@ To turn off the the test macros.
 #define DEBUGL   DEBUGQ	<<QString("%1[%2]").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__)
 #define DEBUGF   DEBUGQ	<<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
 #define DEBUGFW  DEBUGW	<<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
+//#define DEBUGFW  qCritical().noquote()<<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
+#define DEBUGFC  qCritical().noquote()<<QString("%1[%2]%3").arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
 #define DEBUGT   DEBUGQ	<<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__)
 #define DEBUGTF  DEBUGQ	<<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
 #define DEBUGTFW  DEBUGW	<<QString("%1 %2[%3]%4").arg(QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")).arg(QFileInfo( __FILE__).baseName()).arg(__LINE__).arg(__func__)
@@ -113,6 +115,7 @@ To turn off the the test macros.
 #define DEBUGT
 #define DEBUGTF
 #define DEBUGTFW
+#define DEBUGFC
 
 #define Z( XX )
 #define ZZ( XX , YY)