diff --git a/config/config.sample.php b/config/config.sample.php
index 48189e067c199..4560dfa762fca 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -339,7 +339,7 @@
  * Tokens are still checked every 5 minutes for validity
  * max value: 300
  *
- * Defaults to ``300``
+ * Defaults to ``60``
  */
 'token_auth_activity_update' => 60,
 
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 458982315032d..90ae35584787a 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -45,6 +45,7 @@
 use OC\Authentication\Exceptions\PasswordLoginForbiddenException;
 use OC\Authentication\Token\IProvider;
 use OC\Authentication\Token\IToken;
+use OC\Authentication\Token\PublicKeyToken;
 use OC\Hooks\Emitter;
 use OC\Hooks\PublicEmitter;
 use OC_User;
@@ -772,6 +773,9 @@ private function checkTokenCredentials(IToken $dbToken, $token) {
 		}
 
 		$dbToken->setLastCheck($now);
+		if ($dbToken instanceof PublicKeyToken) {
+			$dbToken->setLastActivity($now);
+		}
 		$this->tokenProvider->updateToken($dbToken);
 		return true;
 	}