diff --git a/lbplanner/classes/helpers/config_helper.php b/lbplanner/classes/helpers/config_helper.php
index 484bc9de..37a1ff96 100644
--- a/lbplanner/classes/helpers/config_helper.php
+++ b/lbplanner/classes/helpers/config_helper.php
@@ -72,7 +72,7 @@ public static function add_customfield(): void {
         }
     }
     /**
-     * Adds a customfield to moodle for each activity where teachers can select GK EK or both.
+     * Removes a customfield from moodle for each activity where teachers can select GK EK or both.
      *
      * @throws \coding_exception
      * @throws \moodle_exception
diff --git a/lbplanner/classes/helpers/course_helper.php b/lbplanner/classes/helpers/course_helper.php
index d43d31d8..021eba38 100644
--- a/lbplanner/classes/helpers/course_helper.php
+++ b/lbplanner/classes/helpers/course_helper.php
@@ -107,7 +107,11 @@ public static function get_all_eduplanner_courses(bool $onlyenrolled=true): arra
                     ue.status = :active
                 AND e.status = :enabled
                 AND ue.timestart <= :now
-                AND c.enddate > :courseexpiredate
+                AND ue.timeend >= :now
+                AND (
+                       c.enddate > :courseexpiredate
+                    OR c.enddate = 0
+                )
                 AND ti.tagid = :lbptagid
                 AND ti.itemtype = 'course'",
                 [
@@ -123,7 +127,12 @@ public static function get_all_eduplanner_courses(bool $onlyenrolled=true): arra
             $mdlcourses = $DB->get_records_sql("
                 SELECT c.* FROM {course} c
                 INNER JOIN {tag_instance} ti ON (ti.itemid = c.id)
-                WHERE c.enddate > :courseexpiredate AND ti.tagid = :lbptagid AND ti.itemtype = 'course'",
+                WHERE (
+                       c.enddate > :courseexpiredate
+                    OR c.enddate = 0
+                )
+                AND ti.tagid = :lbptagid
+                AND ti.itemtype = 'course'",
                 [
                     "courseexpiredate" => $courseexpiredate,
                     "lbptagid" => $lbptag->id,
diff --git a/lbplanner/db/uninstall.php b/lbplanner/db/uninstall.php
index 52003a1e..6f2c06a2 100644
--- a/lbplanner/db/uninstall.php
+++ b/lbplanner/db/uninstall.php
@@ -20,17 +20,19 @@
  *
  * @package local_lbplanner
  * @subpackage db
- * @copyright 2024 NecodeIT
+ * @copyright 2025 NecodeIT
  * @license https://creativecommons.org/licenses/by-nc-sa/4.0/ CC-BY-NC-SA 4.0 International or later
  */
 
-use local_lbplanner\helpers\config_helper;
-
+use local_lbplanner\helpers\{config_helper, course_helper};
 
 /**
  * Runs when plugin is uninstalled
  */
 function xmldb_local_lbplanner_uninstall() {
     config_helper::remove_customfield();
+
+    $tag = core_tag_tag::get_by_name(core_tag_collection::get_default(), course_helper::EDUPLANNER_TAG, strictness:MUST_EXIST);
+    core_tag_tag::delete_tags($tag->id);
 }