diff --git a/src/Module/Settings/TwoFactor/Trusted.php b/src/Module/Settings/TwoFactor/Trusted.php
index 61289c1f8..12327a591 100644
--- a/src/Module/Settings/TwoFactor/Trusted.php
+++ b/src/Module/Settings/TwoFactor/Trusted.php
@@ -107,12 +107,12 @@ class Trusted extends BaseSettings
 
 		$trustedBrowserDisplay = array_map(function (TwoFactor\Model\TrustedBrowser $trustedBrowser) use ($parser) {
 			$dates = [
-				'created_ago' => Temporal::getRelativeDate($trustedBrowser->created),
-				'created_utc' => DateTimeFormat::utc($trustedBrowser->created, 'c'),
-				'created_local' => DateTimeFormat::local($trustedBrowser->created, 'r'),
-				'last_used_ago' => Temporal::getRelativeDate($trustedBrowser->last_used),
-				'last_used_utc' => DateTimeFormat::utc($trustedBrowser->last_used, 'c'),
-				'last_used_local' => DateTimeFormat::local($trustedBrowser->last_used, 'r'),
+				'created_ago'     => Temporal::getRelativeDate($trustedBrowser->created),
+				'created_utc'     => DateTimeFormat::utc($trustedBrowser->created, 'c'),
+				'created_local'   => DateTimeFormat::local($trustedBrowser->created, 'r'),
+				'last_used_ago'   => Temporal::getRelativeDate($trustedBrowser->last_used),
+				'last_used_utc'   => $trustedBrowser->last_used ? DateTimeFormat::utc($trustedBrowser->last_used, 'c') : '',
+				'last_used_local' => $trustedBrowser->last_used ? DateTimeFormat::local($trustedBrowser->last_used, 'r') : '',
 			];
 
 			$result = $parser->parse($trustedBrowser->user_agent);
diff --git a/src/Security/TwoFactor/Model/AppSpecificPassword.php b/src/Security/TwoFactor/Model/AppSpecificPassword.php
index 13e03c663..6d1ef0bdc 100644
--- a/src/Security/TwoFactor/Model/AppSpecificPassword.php
+++ b/src/Security/TwoFactor/Model/AppSpecificPassword.php
@@ -86,11 +86,9 @@ class AppSpecificPassword
 		$appSpecificPasswords = DBA::toArray($appSpecificPasswordsStmt);
 
 		array_walk($appSpecificPasswords, function (&$value) {
-			$last_used = $value['last_used'] ?? DBA::NULL_DATETIME;
-
-			$value['ago'] = Temporal::getRelativeDate($last_used);
-			$value['utc'] = DateTimeFormat::utc($last_used, 'c');
-			$value['local'] = DateTimeFormat::local($last_used, 'r');
+			$value['ago']   = Temporal::getRelativeDate($value['last_used']);
+			$value['utc']   = $value['last_used'] ? DateTimeFormat::utc($value['last_used'], 'c') : '';
+			$value['local'] = $value['last_used'] ? DateTimeFormat::local($value['last_used'], 'r') : '';
 		});
 
 		return $appSpecificPasswords;