diff --git a/sleepyhead/Graphs/gGraph.cpp b/sleepyhead/Graphs/gGraph.cpp
index 4202b3aa..d784c356 100644
--- a/sleepyhead/Graphs/gGraph.cpp
+++ b/sleepyhead/Graphs/gGraph.cpp
@@ -513,6 +513,19 @@ void gGraph::ToolTip(QString text, int x, int y, int timeout)
 // YAxis Autoscaling code
 void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
 {
+    if ((zoomY() == 0) && PROFILE.appearance->allowYAxisScaling()) {
+        if (rec_maxy > rec_miny) {
+            // Use graph preference settings only for this graph
+            miny = rec_miny;
+            maxy = rec_maxy;
+            return;
+        } // else use loader defined min/max settings
+
+    } else {
+        // Autoscale this graph
+        miny = min_y, maxy = max_y;
+    }
+
     int m, t;
     bool ymin_good = false, ymax_good = false;
 
diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 0024cfd5..17211167 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -173,7 +173,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
     top++;
 
-    EventDataType miny, maxy;
     double minx, maxx;
 
 
@@ -185,17 +184,12 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
     // hmmm.. subtract_offset..
 
-    /*if (miny<0) {
-        miny=-MAX(fabs(miny),fabs(maxy));
-    }*/
+    EventDataType miny = m_physminy;
+    EventDataType maxy = m_physmaxy;
 
-    if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
-        miny = m_physminy, maxy = m_physmaxy;
-    } else {
-        miny = w.min_y, maxy = w.max_y;
-    }
     w.roundY(miny, maxy);
 
+
 //#define DEBUG_AUTOSCALER
 #ifdef DEBUG_AUTOSCALER
     QString a = QString().sprintf("%.2f - %.2f",miny, maxy);
diff --git a/sleepyhead/Graphs/gYAxis.cpp b/sleepyhead/Graphs/gYAxis.cpp
index 4c5e62e8..9f873166 100644
--- a/sleepyhead/Graphs/gYAxis.cpp
+++ b/sleepyhead/Graphs/gYAxis.cpp
@@ -43,19 +43,8 @@ void gXGrid::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
     int x, y;
 
-    EventDataType miny, maxy;
-
-    if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
-        miny = w.physMinY();
-        maxy = w.physMaxY();
-    } else {
-        miny = w.min_y;
-        maxy = w.max_y;
-
-        if (miny < 0) { // even it up if it's starts negative
-            miny = -MAX(fabs(miny), fabs(maxy));
-        }
-    }
+    EventDataType miny = w.physMinY();
+    EventDataType maxy = w.physMaxY();
 
     w.roundY(miny, maxy);
 
@@ -297,16 +286,9 @@ void gYAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
 
         int labelW = 0;
 
-        EventDataType miny;
-        EventDataType maxy;
 
-        if (w.zoomY() == 0 && PROFILE.appearance->allowYAxisScaling()) {
-            miny = w.physMinY();
-            maxy = w.physMaxY();
-        } else {
-            miny = w.min_y;
-            maxy = w.max_y;
-        }
+        EventDataType miny = w.physMinY();
+        EventDataType maxy = w.physMaxY();
 
         w.roundY(miny, maxy);
 
diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp
index f8b80c0c..bec7c90f 100644
--- a/sleepyhead/preferencesdialog.cpp
+++ b/sleepyhead/preferencesdialog.cpp
@@ -821,10 +821,11 @@ void PreferencesDialog::on_resetGraphButton_clicked()
         return;
     }
 
-    gGraphView *views[3];
+    gGraphView *views[3] = {0};
     views[0] = mainwin->getDaily()->graphView();
     views[1] = mainwin->getOverview()->graphView();
-    views[2] = mainwin->getOximetry()->graphView();
+    if (mainwin->getOximetry())
+        views[2] = mainwin->getOximetry()->graphView();
 
     // Iterate over all graph containers.
     for (unsigned j = 0; j < 3; j++) {