diff --git a/resources/views/settings/applications.blade.php b/resources/views/settings/applications.blade.php
index b0fa94d18..be40dfdf7 100644
--- a/resources/views/settings/applications.blade.php
+++ b/resources/views/settings/applications.blade.php
@@ -2,20 +2,23 @@
 
 @section('section')
 
-  <div class="title">
-    <h3 class="font-weight-bold">Applications</h3>
-  </div>
-  <hr>
-<passport-authorized-clients></passport-authorized-clients>
-<passport-personal-access-tokens></passport-personal-access-tokens>
-
+<div class="title">
+	<h3 class="font-weight-bold">Applications</h3>
+</div>
+<hr>
+@if(config('pixelfed.oauth_enabled') == true)
+	<passport-authorized-clients></passport-authorized-clients>
+	<passport-personal-access-tokens></passport-personal-access-tokens>
+@else
+	<p class="lead">OAuth has not been enabled on this instance.</p>
+@endif
 @endsection
 
 @push('scripts')
 <script type="text/javascript" src="{{mix('js/developers.js')}}"></script>
 <script type="text/javascript">
-  new Vue({ 
-    el: '#content' 
-  });
+	new Vue({ 
+		el: '#content' 
+	});
 </script>
 @endpush
\ No newline at end of file
diff --git a/resources/views/settings/developers.blade.php b/resources/views/settings/developers.blade.php
index 0caf99afa..14f80094e 100644
--- a/resources/views/settings/developers.blade.php
+++ b/resources/views/settings/developers.blade.php
@@ -2,19 +2,23 @@
 
 @section('section')
 
-  <div class="title">
-    <h3 class="font-weight-bold">Developers</h3>
-  </div>
-  <hr>
-  <passport-clients></passport-clients>
+<div class="title">
+	<h3 class="font-weight-bold">Developers</h3>
+</div>
+<hr>
+@if(config('pixelfed.oauth_enabled') == true)
+	<passport-clients></passport-clients>
+@else
+	<p class="lead">OAuth has not been enabled on this instance.</p>
+@endif
 
 @endsection
 
 @push('scripts')
 <script type="text/javascript" src="{{mix('js/developers.js')}}"></script>
 <script type="text/javascript">
-  new Vue({ 
-    el: '#content' 
-  });
+	new Vue({ 
+		el: '#content' 
+	});
 </script>
 @endpush
\ No newline at end of file
diff --git a/resources/views/settings/partial/sidebar.blade.php b/resources/views/settings/partial/sidebar.blade.php
index 68fd09e83..32f4ff6cd 100644
--- a/resources/views/settings/partial/sidebar.blade.php
+++ b/resources/views/settings/partial/sidebar.blade.php
@@ -43,6 +43,7 @@
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.dataexport')}}">Data Export</a>
       </li>
       
+      @if(config('pixelfed.oauth_enabled') == true)
       <li class="nav-item">
       <hr>
       </li>
@@ -52,6 +53,8 @@
       <li class="nav-item pl-3 {{request()->is('settings/developers')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.developers')}}">Developers</a>
       </li>
+      @endif
+
       <li class="nav-item">
       <hr>
       </li>