diff --git a/qml/Screens/TimeSettingsScreen.qml b/qml/Screens/TimeSettingsScreen.qml
index ae60e1f..239ff6d 100644
--- a/qml/Screens/TimeSettingsScreen.qml
+++ b/qml/Screens/TimeSettingsScreen.qml
@@ -102,7 +102,7 @@ ColumnLayout {
 
                 Tumbler {
                     id: yearTumbler
-                    model: range(1970, 230)
+                    model: range(2000, 200)
                     delegate: tumblerComponent
                     Layout.alignment: Qt.AlignCenter
                     Layout.fillWidth: true
@@ -187,7 +187,7 @@ ColumnLayout {
             onClicked: {
                 const date = new Date()
 
-                yearTumbler.currentIndex = date.getFullYear() - 1970
+                yearTumbler.currentIndex = date.getFullYear() - 2000
                 monthTumbler.currentIndex = date.getMonth()
                 dayTumbler.currentIndex = date.getDate() - 1
 
@@ -210,7 +210,8 @@ ColumnLayout {
                 date.setMinutes(minutesTumbler.currentIndex)
                 date.setSeconds(secondsTumbler.currentIndex)
 
-                BmsInterface.commands().sendTerminalCmd("setUnixTime " + Math.round(date / 1000))
+                const localTimestamp = (Math.round(date / 1000) - date.getTimezoneOffset() * 60).toString(16)
+                BmsInterface.commands().sendTerminalCmd("setUnixTime " + localTimestamp)
             }
         }
     }