diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index db98a36..4306c45 100644
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1094,16 +1094,6 @@
 	struct dirent *dt;
 	std::string ats_path;
 
-
-	// Don't fix the time of it already is over year 2000, it is likely already okay, either
-	// because the RTC is fine or because the recovery already set it and then crashed
-	gettimeofday(&tv, NULL);
-	if(tv.tv_sec > 946684800) // timestamp of 2000-01-01 00:00:00
-	{
-		LOGINFO("TWFunc::Fixup_Time: not fixing time, it seems to be already okay (after year 2000).\n");
-		return;
-	}
-
 	if(!PartitionManager.Mount_By_Path("/data", false))
 		return;
 
diff --git a/twrp.cpp b/twrp.cpp
index b67631e..3e0fc9b 100644
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -273,7 +273,8 @@
 	DataManager::ReadSettingsFile();
 
 	// Fixup the RTC clock on devices which require it
-	TWFunc::Fixup_Time_On_Boot();
+	if(crash_counter == 0)
+		TWFunc::Fixup_Time_On_Boot();
 
 	// Run any outstanding OpenRecoveryScript
 	if (DataManager::GetIntValue(TW_IS_ENCRYPTED) == 0 && (TWFunc::Path_Exists(SCRIPT_FILE_TMP) || TWFunc::Path_Exists(SCRIPT_FILE_CACHE))) {