diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
index 3629b955f..3d2f91132 100644
--- a/app/Http/Controllers/ContactsController.php
+++ b/app/Http/Controllers/ContactsController.php
@@ -72,6 +72,7 @@ class ContactsController extends Controller
         return view('people.index')
             ->withContacts($contacts->unique('id'))
             ->withTags($tags)
+            ->withUserTags(auth()->user()->account->tags)
             ->withUrl($url)
             ->withTagCount($count)
             ->withTagLess($request->get('no_tag') ?? false);
diff --git a/resources/views/people/index.blade.php b/resources/views/people/index.blade.php
index 64542b2a1..eb9e1b897 100644
--- a/resources/views/people/index.blade.php
+++ b/resources/views/people/index.blade.php
@@ -169,7 +169,7 @@
               @include('partials.components.people-upgrade-sidebar')
 
               <ul>
-              @foreach (auth()->user()->account->tags as $dbtag)
+              @foreach ($userTags as $dbtag)
                 @if ($dbtag->contacts()->count() > 0)
                 <li>
                     <span class="pretty-tag"><a href="/people?{{$url}}tag{{$tagCount}}={{ $dbtag->name_slug }}">{{ $dbtag->name }}</a></span>
@@ -177,9 +177,12 @@
                 </li>
                 @endif
               @endforeach
+
+              @if ($userTags->count() != 0)
                 <li class="f7 mt3">
                     <a href="/people?no_tag=true">{{ trans('people.people_list_untagged') }}</a>
                 </li>
+              @endif
               </ul>
             </div>