diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php
index 1bef479d..a5e7007e 100644
--- a/app/Http/Controllers/FederationController.php
+++ b/app/Http/Controllers/FederationController.php
@@ -123,8 +123,11 @@ class FederationController extends Controller
 
     public function userOutbox(Request $request, $username)
     {
+      if(config('pixelfed.activitypub_enabled') == false) {
+        abort(403);
+      }
+      
       $user = Profile::whereNull('remote_url')->whereUsername($username)->firstOrFail();
-
       $timeline = $user->statuses()->orderBy('created_at','desc')->paginate(10);
       $fractal = new Fractal\Manager();
       $resource = new Fractal\Resource\Item($user, new ProfileOutbox);
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 7aba7e57..a9d9846c 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -25,7 +25,7 @@ class ProfileController extends Controller
         'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
       ];
 
-      if(in_array($request->header('accept'), $mimes)) {
+      if(in_array($request->header('accept'), $mimes) && config('pixelfed.activitypub_enabled')) {
         return $this->showActivityPub($request, $user);
       }
 
diff --git a/config/pixelfed.php b/config/pixelfed.php
index 479df7fa..69a8f3df 100644
--- a/config/pixelfed.php
+++ b/config/pixelfed.php
@@ -71,5 +71,9 @@ return [
     |
     */
     'open_registration' => env('OPEN_REGISTRATION', true),
+
+    'remote_follow_enabled' => env('REMOTE_FOLLOW', false),
+
+    'activitypub_enabled' => env('ACTIVITY_PUB', false),
     
 ];
\ No newline at end of file