diff --git a/field_collection.module b/field_collection.module
index fe9911c..2adf32a 100644
--- a/field_collection.module
+++ b/field_collection.module
@@ -918,14 +918,18 @@ function field_collection_field_formatter_links(&$element, $entity_type, $entity
     }
   }
   // If there is no add link, add a special class to the last item.
-  if (empty($element['#suffix'])) {
+  $children = count(element_children($element));
+  if (empty($element['#suffix']) && $children > 0) {
     $index = count(element_children($element)) - 1;
     $element[$index]['#attributes']['class'][] = 'field-collection-view-final';
   }
 
-  $element += array('#prefix' => '', '#suffix' => '');
-  $element['#prefix'] .= '<div class="field-collection-container clearfix">';
-  $element['#suffix'] .= '</div>';
+  // Only add the wrapper if there are items and/or a link.
+  if ($children > 0 || !empty($element['#suffix'])) {
+    $element += array('#prefix' => '', '#suffix' => '');
+    $element['#prefix'] .= '<div class="field-collection-container clearfix">';
+    $element['#suffix'] .= '</div>';
+  }
 
   return $element;
 }