diff --git a/resources/views/portal/ninja2020/components/general/footer.blade.php b/resources/views/portal/ninja2020/components/general/footer.blade.php
index 662a467141..21f81c0cb9 100644
--- a/resources/views/portal/ninja2020/components/general/footer.blade.php
+++ b/resources/views/portal/ninja2020/components/general/footer.blade.php
@@ -3,11 +3,19 @@
         <span class="text-xs md:text-sm text-gray-700">{{ ctrans('texts.footer_label', ['year' => date('Y')])  }}</span>
 
         <div class="flex items-center space-x-2">
-            <a x-on:click="privacy = true; tos = false" href="#" class="button-link text-sm primary-color flex items-center">{{ __('texts.privacy_policy')}}</a>
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-minus">
-                <line x1="5" y1="12" x2="19" y2="12"></line>
-            </svg>
-            <a x-on:click="privacy = false; tos = true" href="#" class="button-link text-sm primary-color flex items-center">{{ __('texts.terms')}}</a>
+            @if(strlen($client->getSetting('client_portal_privacy_policy')) > 1)
+                <a x-on:click="privacy = true; tos = false" href="#" class="button-link text-sm primary-color flex items-center">{{ __('texts.privacy_policy')}}</a>
+            @endif
+
+            @if(strlen($client->getSetting('client_portal_privacy_policy')) > 1 && strlen($client->getSetting('client_portal_terms')) > 1)
+                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-minus">
+                    <line x1="5" y1="12" x2="19" y2="12"></line>
+                </svg> <!-- Long dash between items. -->
+            @endif
+
+            @if(strlen($client->getSetting('client_portal_terms')) > 1)
+                <a x-on:click="privacy = false; tos = true" href="#" class="button-link text-sm primary-color flex items-center">{{ __('texts.terms')}}</a>
+            @endif
         </div>
     </section>
 
@@ -17,11 +25,15 @@
         </a>
     @endif
 
-    @component('portal.ninja2020.components.general.pop-up', ['title' => __('texts.privacy_policy') ,'show_property' => 'privacy'])
-        {!! $client->getSetting('client_portal_privacy_policy') !!}
-    @endcomponent
+    @if(strlen($client->getSetting('client_portal_privacy_policy')) > 1)
+        @component('portal.ninja2020.components.general.pop-up', ['title' => __('texts.privacy_policy') ,'show_property' => 'privacy'])
+            {!! $client->getSetting('client_portal_privacy_policy') !!}
+        @endcomponent
+    @endif
 
-    @component('portal.ninja2020.components.general.pop-up', ['title' => __('texts.terms') ,'show_property' => 'tos'])
-        {!! $client->getSetting('client_portal_terms') !!}
-    @endcomponent
+    @if(strlen($client->getSetting('client_portal_terms')) > 1)
+        @component('portal.ninja2020.components.general.pop-up', ['title' => __('texts.terms') ,'show_property' => 'tos'])
+            {!! $client->getSetting('client_portal_terms') !!}
+        @endcomponent
+    @endif
 </footer>