diff --git a/src/main/java/de/ph87/data/topic/TopicRepository.java b/src/main/java/de/ph87/data/topic/TopicRepository.java
index 1e22d70..43541f5 100644
--- a/src/main/java/de/ph87/data/topic/TopicRepository.java
+++ b/src/main/java/de/ph87/data/topic/TopicRepository.java
@@ -10,7 +10,7 @@ public interface TopicRepository extends ListCrudRepository<Topic, Long> {
 
   boolean existsByName(@NonNull String name);
 
-  @Query("select new de.ph87.data.topic.TopicDto(t) from Topic t where t.name = :name")
+  @Query("select new de.ph87.data.topic.TopicDto(t) from Topic t where t.name = :name and t.enabled")
   Optional<TopicDto> findDtoByEnabledTrueAndName(@NonNull String name);
 
 }