diff --git a/main/social/terms.php b/main/social/terms.php
index 1727c961bd..4ddd3fd8e2 100644
--- a/main/social/terms.php
+++ b/main/social/terms.php
@@ -14,21 +14,18 @@ api_block_anonymous_users();
 $language = api_get_interface_language();
 $language = api_get_language_id($language);
 $term = LegalManager::get_last_condition($language);
-$extraTerms = '';
 
 if (!$term) {
     // look for the default language
     $language = api_get_setting('platformLanguage');
     $language = api_get_language_id($language);
     $term = LegalManager::get_last_condition($language);
-    $termExtraFields = new ExtraFieldValue('terms_and_condition');
-    $values = $termExtraFields->getAllValuesByItem($term_preview['id']);
+}
 
-    foreach ($values as $value) {
-        //if ($value['variable'] === 'category') {
-        $extraTerms .= '<h3>'.$value['display_text'].'</h3><br />'.$value['value'].'<br />';
-        //}
-    }
+$termExtraFields = new ExtraFieldValue('terms_and_condition');
+$values = $termExtraFields->getAllValuesByItem($term['id']);
+foreach ($values as $value) {
+    $term['content'] .= '<h3>'.$value['display_text'].'</h3><br />'.$value['value'].'<br />';
 }
 
 $term['date_text'] = get_lang('PublicationDate').': '.
@@ -58,8 +55,6 @@ $actions = Display::url(
 
 $tpl->assign('actions', Display::toolbarAction('toolbar', [$actions]));
 
-$tpl->assign('extra_terms', $extraTerms);
-
 // Block Social Avatar
 SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
 if (api_get_setting('allow_social_tool') === 'true') {
diff --git a/main/template/default/social/terms.tpl b/main/template/default/social/terms.tpl
index 58a331dce0..335ff4ccf2 100644
--- a/main/template/default/social/terms.tpl
+++ b/main/template/default/social/terms.tpl
@@ -14,7 +14,7 @@
             {{ display.panel('TermsAndConditions'|get_lang, term.content, term.date_text ) }}
         {% endif %}
 
-        {{ extra_terms }}
+
     </div>
 </div>
 {% endblock %}