diff --git a/src/Handler/Utils/Communication.hs b/src/Handler/Utils/Communication.hs
index 1ccf45abc..d0ebfb186 100644
--- a/src/Handler/Utils/Communication.hs
+++ b/src/Handler/Utils/Communication.hs
@@ -158,6 +158,7 @@ commR CommunicationRoute{..} =  do
             checkedIdentBase <- newIdent
             let checkedCategories = Set.mapMonotonic (unEnumPosition . fst) . Set.filter (\k' -> Map.foldrWithKey (\k (_, checkState) -> (||) $ k == k' && checkState /= FormSuccess False && (checkState /= FormMissing || maybe True snd (chosenRecipients' !? k))) False state) $ Map.keysSet state
                 checkedIdent c = checkedIdentBase <> "-" <> toPathPiece c
+                hasContent c = not (null $ categoryIndices c) || Map.member (1, (EnumPosition c, 0)) addWdgts
                 categoryIndices c = Set.filter ((== c) . unEnumPosition . fst) $ review liveCoords liveliness
             $(widgetFile "widgets/communication/recipientLayout")
           miDelete :: MapLiveliness (EnumLiveliness RecipientCategory) ListLength -> (EnumPosition RecipientCategory, ListPosition) -> MaybeT (MForm Handler) (Map (EnumPosition RecipientCategory, ListPosition) (EnumPosition RecipientCategory, ListPosition))
diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index 3fbdddad4..c52ff534d 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -5,10 +5,10 @@ $forall category <- activeCategories
     <label .recipient-category__label for=#{checkedIdent category}>
       _{category}
 
-    $# TODO: only add fieldset if there are options to choose from
-    <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
-      $forall optIx <- categoryIndices category
-        ^{cellWdgts ! optIx}
+    $if hasContent category
+      <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
+        $forall optIx <- categoryIndices category
+          ^{cellWdgts ! optIx}
 
-      $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
-        ^{addWdgt}
+        $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
+          ^{addWdgt}