diff --git a/includes/class-health-check.php b/includes/class-health-check.php
index 22d95f2b..6c4198d1 100644
--- a/includes/class-health-check.php
+++ b/includes/class-health-check.php
@@ -254,15 +254,19 @@ class Health_Check {
 	public static function is_webfinger_endpoint_accessible() {
 		$user = \wp_get_current_user();
 
+		$resource = '';
+
 		if ( ! is_user_type_disabled( 'blog' ) ) {
-			$account = get_webfinger_resource( $user->ID );
+			$user = Users::get_by_id( $user->ID );
 		} elseif ( ! is_user_type_disabled( 'user' ) ) {
-			$account = get_webfinger_resource( Users::BLOG_USER_ID );
-		} else {
-			$account = '';
+			$user = Users::get_by_id( Users::BLOG_USER_ID );
 		}
 
-		$url = Webfinger::resolve( $account );
+		if ( $user && ! is_wp_error( $user ) ) {
+			$resource = $user->get_webfinger();
+		}
+
+		$url = Webfinger::resolve( $resource );
 		if ( \is_wp_error( $url ) ) {
 			$allowed = array( 'code' => array() );
 			$not_accessible = wp_kses(
diff --git a/includes/class-webfinger.php b/includes/class-webfinger.php
index 75f5885e..67b6d4f9 100644
--- a/includes/class-webfinger.php
+++ b/includes/class-webfinger.php
@@ -20,11 +20,6 @@ class Webfinger {
 	 * @return string The user-resource
 	 */
 	public static function get_user_resource( $user_id ) {
-		// use WebFinger plugin if installed
-		if ( \function_exists( '\get_webfinger_resource' ) ) {
-			return \get_webfinger_resource( $user_id, false );
-		}
-
 		$user = Users::get_by_id( $user_id );
 		if ( ! $user || is_wp_error( $user ) ) {
 			return '';