diff --git a/fet2020/intern/admin.py b/fet2020/intern/admin.py
index d15a42d4..15fb3a76 100644
--- a/fet2020/intern/admin.py
+++ b/fet2020/intern/admin.py
@@ -114,7 +114,6 @@ class TopicAdmin(admin.ModelAdmin):
                 "fields": (
                     "title",
                     "topic_group",
-                    "task_list",
                     "archive",
                     "description",
                 )
diff --git a/fet2020/templates/intern/task_create.html b/fet2020/templates/intern/task_create.html
deleted file mode 100644
index d16cb036..00000000
--- a/fet2020/templates/intern/task_create.html
+++ /dev/null
@@ -1,60 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}Task hinzufügen{% endblock %}
-
-{% block content %}
-<!-- Main Content -->
-<main class="container mx-auto w-full px-4 my-8 flex-1">
-    <h1 class="page-title">Task hinzufügen</h1>
-    <div class="w-full h-full flex-1 flex justify-center items-center">
-        <form action="" method="POST" enctype="multipart/form-data" class="w-full max-w-prose sm:px-28 sm:py-4 grid grid-cols-1 gap-y-3 sm:gap-y-6 text-gray-900">
-            {% csrf_token %}
-
-            {% if form.non_field_errors %}
-                <div class="alert alert-danger">
-                    <i class="alert-icon fa-solid fa-check-circle"></i>
-                    <h2 class="alert-title">Fehler:</h2>
-                    <div class="alert-body">{{ form.non_field_errors }}</div>
-                </div>
-            {% endif %}
-
-            <label class="block">
-                <span class="text-gray-700 dark:text-gray-200">{{ form.title.label }}</span>
-                {% if form.title.errors %}
-                    <div class="alert alert-danger">
-                        <div class="alert-body">{{ form.title.errors }}</div>
-                    </div>
-                {% endif %}
-                <input type="text" id="id_title" name="title" class="mt-1 block w-full rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50" required>
-            </label>
-
-            <label>
-                <span class="text-gray-700 dark:text-gray-200">{{ form.due_date.label }}</span>
-                <input type="date" id="id_due_date" name="due_date" class="block w-full mt-1 rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50">
-            </label>
-
-            <label>
-                <span class="text-gray-700 dark:text-gray-200">{{ form.assigned_to.label }}</span>
-                {% if form.assigned_to.errors %}
-                    <div class="alert alert-danger">
-                        <div class="alert-body">{{ form.assigned_to.errors }}</div>
-                    </div>
-                {% endif %}
-                <select id="id_assigned_to" name="assigned_to" class="block w-full mt-1 rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50">
-                    {% for elem in form.assigned_to %}
-                        {% if forloop.first %}
-                            <option value="">Alle</option>
-                        {% else %}
-                            {{ elem }}
-                        {% endif %}
-                    {% endfor %}
-                </select>
-            </label>
-
-            <input type="hidden" name="task_list" value="{{ topic.task_list.id }}" id="id_task_list">
-
-            <input type="submit" class="block btn btn-primary" value="Hinzufügen">
-        </form>
-    </div>
-</main>
-{% endblock %}
diff --git a/fet2020/templates/intern/topic/topic_detail.html b/fet2020/templates/intern/topic/topic_detail.html
index 0a1aedfa..46b0a21f 100644
--- a/fet2020/templates/intern/topic/topic_detail.html
+++ b/fet2020/templates/intern/topic/topic_detail.html
@@ -33,9 +33,6 @@
         
         <section class="flex flex-col sm:flex-row justify-end gap-4">
             <a href="{% url 'intern:topic_update' topic.topic_group.slug topic.slug %}" class="btn btn-primary block"><i class="fa-solid fa-pen-to-square mr-2"></i>Thema bearbeiten</a>
-            {% if topic.task_list %}
-                <a href="{% url 'intern:task_create' topic.topic_group.slug topic.slug %}" class="btn btn-primary block"><i class="fa-solid fa-plus-square mr-2"></i>Task hinzufügen</a>
-            {% endif %}
         </section>
     </div>
 </main>