diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
index 4ac37b1ea0..6f6ac46eb9 100644
--- a/apps/user_webfinger/host-meta.php
+++ b/apps/user_webfinger/host-meta.php
@@ -1,4 +1,7 @@
 <?php
+if (!OCP\App::isEnabled("user_webfinger")) {
+	return;
+}
 
 if(class_exists('OC')){
 	$WEBROOT=OC::$WEBROOT;
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index e5b7f042d5..f06346672f 100644
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -1,4 +1,8 @@
 <?php
+if (!OCP\App::isEnabled("user_webfinger")) {
+	return;
+}
+
 header("Access-Control-Allow-Origin: *");
 header("Content-Type: application/xrd+json");
 
@@ -15,7 +19,7 @@ header("Content-Type: application/xrd+json");
  * 	href="<?php echo WF_BASEURL; ?>/apps/myApp/profile.php?user=<?php echo WF_USER; ?>">
  * </Link>
  *
- '* but can also use complex database queries to generate the webfinger result
+ * but can also use complex database queries to generate the webfinger result
  **/
 
 $userName = '';