diff --git a/lib/obp60task/OBP60Extensions.cpp b/lib/obp60task/OBP60Extensions.cpp
index ca73a87..d8598ec 100644
--- a/lib/obp60task/OBP60Extensions.cpp
+++ b/lib/obp60task/OBP60Extensions.cpp
@@ -438,7 +438,7 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
                 getdisplay().print(" ");
                 getdisplay().print(tz == 0 ? "UTC" : "LOT");
             } else {
-                getdisplay().print("RTC invalid");
+                drawTextRalign(396, 15, "RTC invalid");
             }
         }
         else if (timesource == "GPS") {
@@ -458,7 +458,7 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
                     getdisplay().print("12:00 01.01.2024 LOT");
                 }
                 else{
-                    getdisplay().print("No GPS data");
+                    drawTextRalign(396, 15, "No GPS data");
                 }
             }
         } // timesource == "GPS"
diff --git a/lib/obp60task/PageClock.cpp b/lib/obp60task/PageClock.cpp
index 5516356..fcdace1 100644
--- a/lib/obp60task/PageClock.cpp
+++ b/lib/obp60task/PageClock.cpp
@@ -378,7 +378,7 @@ double timezone = 0; // there are timezones with non int offsets, e.g. 5.5 or 5.
 
         // Draw hour pointer
         float startwidth = 8;       // Start width of pointer
-        if(valid1 == true || commonData->data.rtcValid || holdvalues == true || simulation == true){
+        if(valid1 == true || (source == 'R' && commonData->data.rtcValid) || holdvalues == true || simulation == true){
             float sinx=sin(hour * 30.0 * pi / 180);     // Hour
             float cosx=cos(hour * 30.0 * pi / 180);
             // Normal pointer
@@ -404,7 +404,7 @@ double timezone = 0; // there are timezones with non int offsets, e.g. 5.5 or 5.
 
         // Draw minute pointer
         startwidth = 8;       // Start width of pointer
-        if(valid1 == true || commonData->data.rtcValid || holdvalues == true || simulation == true){
+        if(valid1 == true || (source == 'R' && commonData->data.rtcValid) || holdvalues == true || simulation == true){
             float sinx=sin(minute * 6.0 * pi / 180);     // Minute
             float cosx=cos(minute * 6.0 * pi / 180);
             // Normal pointer