diff --git a/src/Mealz/MealBundle/Service/CombinedMealService.php b/src/Mealz/MealBundle/Service/CombinedMealService.php
index 4d9a778cf..263a20541 100644
--- a/src/Mealz/MealBundle/Service/CombinedMealService.php
+++ b/src/Mealz/MealBundle/Service/CombinedMealService.php
@@ -77,8 +77,8 @@ private function createCombinedDish(DishRepository $dishRepo): Dish
         $combinedDish->setPrice($this->defaultPrice);
         $combinedDish->setTitleEn(self::COMBINED_DISH_TITLE_EN);
         $combinedDish->setTitleDe('Kombi-Gericht');
-        $combinedDish->setDescriptionEn('Description - ' . $combinedDish->getTitleEn());
-        $combinedDish->setDescriptionDe('Beschreibung - ' . $combinedDish->getTitleDe());
+        $combinedDish->setDescriptionEn('');
+        $combinedDish->setDescriptionDe('');
 
         $this->entityManager->persist($combinedDish);
         $this->entityManager->flush();
diff --git a/src/Resources/js/modules/combined-meal-service.ts b/src/Resources/js/modules/combined-meal-service.ts
index 1dbffdda2..62162bdbb 100644
--- a/src/Resources/js/modules/combined-meal-service.ts
+++ b/src/Resources/js/modules/combined-meal-service.ts
@@ -74,6 +74,7 @@ export class CombinedMealService {
             // update dish description with titles of booked dishes
             const bookedDishTitles = bdt.map(dishTitle => $(`<div class="dish">${dishTitle}</div>`));
             $dishContainer.find('.description .dish-combination').empty().append(...bookedDishTitles);
+            $dishContainer.find('.title').removeClass('no-description');
             // update booked dish IDs in data attribute
             $dishContainer.attr('data-booked-dishes', bookedDishSlugs.join(','));
 
@@ -142,7 +143,7 @@ export class CombinedMealService {
     private static resetDish($dishContainer: JQuery): void {
         let desc = $dishContainer.data('description');
         $dishContainer.find('.description .dish-combination').empty().text(desc);
-        $dishContainer.find('.title').removeClass('edit');
+        $dishContainer.find('.title').removeClass('edit').addClass('no-description');
         $dishContainer.attr('data-id', '');
         $dishContainer.attr('data-booked-dishes', '');
     }
diff --git a/src/Resources/sass/modules/_meal.scss b/src/Resources/sass/modules/_meal.scss
index 04819f73c..aa16385a5 100755
--- a/src/Resources/sass/modules/_meal.scss
+++ b/src/Resources/sass/modules/_meal.scss
@@ -430,11 +430,13 @@
     visibility: hidden;
     width: 135px;
     margin-left: -60px;
-    padding: 5px 0;
+    padding: 6px 3px;
     border-radius: 6px;
+    white-space: normal;
     color: $color-white;
     background-color: $color-base;
     opacity: 0;
+    line-height: 1.2em;
     text-align: center;
     transition: opacity 1s;