diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html
index 07fadee4..4a09a58b 100644
--- a/helpdesk/templates/helpdesk/ticket_desc_table.html
+++ b/helpdesk/templates/helpdesk/ticket_desc_table.html
@@ -70,7 +70,9 @@
                         <td>{{ ticketcc_string }} <a data-toggle='tooltip' href='{% url 'helpdesk:ticket_cc' ticket.id %}' title='{% trans "Click here to add / remove people who should receive an e-mail whenever this ticket is updated." %}'><strong><button type="button" class="btn btn-warning btn-sm float-right"><i class="fa fa-share"></i></button></strong></a>{% if SHOW_SUBSCRIBE %} <strong><a data-toggle='tooltip' href='?subscribe' title='{% trans "Click here to subscribe yourself to this ticket, if you want to receive an e-mail whenever this ticket is updated." %}'><button type="button" class="btn btn-warning btn-sm float-right"><i class="fas fa-rss-square"></i></button></a></strong>{% endif %}</td>
                     </tr>
 
+                    {% if helpdesk_settings.HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET != False and helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET != False %}
                     <tr>
+                    {% if helpdesk_settings.HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET %}
                         <th class="table-active">{% trans "Dependencies" %}</th>
                         <td>
                             <a data-toggle='tooltip' href='{% url 'helpdesk:ticket_dependency_add' ticket.id %}' title="{% trans "Click on 'Add Dependency', if you want to make this ticket dependent on another ticket. A ticket may not be closed until all tickets it depends on are closed." %}"><button type="button" class="btn btn-primary btn-sm float-right"><i class="fas fa-link"></i></button></a>
@@ -82,6 +84,10 @@
                             {% trans "This ticket has no dependencies." %}
                             {% endfor %}
                         </td>
+                    {% else %}
+                        <th class="table-active"></th>
+                        <td></td>
+                    {% endif %}
                     {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %}
                         <th class="table-active">{% trans "Total time spent" %}</th>
                         <td>{{ ticket.time_spent_formated }}</td>
@@ -90,6 +96,7 @@
                         <td></td>
                     {% endif %}
                     </tr>
+                    {% endif %}
                     {% if ticket.kbitem %}
                     <tr>
                         <th class="table-active">{% trans "Knowlegebase item" %}</th>
diff --git a/helpdesk/urls.py b/helpdesk/urls.py
index fc185cc9..711ffa00 100644
--- a/helpdesk/urls.py
+++ b/helpdesk/urls.py
@@ -108,14 +108,6 @@ urlpatterns = [
         staff.ticket_cc_del,
         name='ticket_cc_del'),
 
-    url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/add/$',
-        staff.ticket_dependency_add,
-        name='ticket_dependency_add'),
-
-    url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/delete/(?P<dependency_id>[0-9]+)/$',
-        staff.ticket_dependency_del,
-        name='ticket_dependency_del'),
-
     url(r'^tickets/(?P<ticket_id>[0-9]+)/attachment_delete/(?P<attachment_id>[0-9]+)/$',
         staff.attachment_del,
         name='attachment_del'),
@@ -170,6 +162,17 @@ urlpatterns = [
 
 ]
 
+if helpdesk_settings.HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET:
+    urlpatterns += [
+            url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/add/$',
+            staff.ticket_dependency_add,
+            name='ticket_dependency_add'),
+
+        url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/delete/(?P<dependency_id>[0-9]+)/$',
+            staff.ticket_dependency_del,
+            name='ticket_dependency_del'),
+    ]
+
 urlpatterns += [
     url(r'^$',
         protect_view(public.Homepage.as_view()),