diff --git a/app/templates/components/species/species-details.hbs b/app/templates/components/species/species-details.hbs
index cd61c64..9772228 100644
--- a/app/templates/components/species/species-details.hbs
+++ b/app/templates/components/species/species-details.hbs
@@ -15,7 +15,8 @@
       <dl class="span-2">
         <dt>Strains</dt>
         <dd>
-          {{#each strain in species.strains}}
+          {{#each species.strains as |strain index|}}
+            {{if index ","}}
             {{#link-to 'strains.show' strain.id}}
               {{strain.strainName}}
             {{/link-to}}
diff --git a/app/templates/species/index.hbs b/app/templates/species/index.hbs
index c2b3d8a..d31940f 100644
--- a/app/templates/species/index.hbs
+++ b/app/templates/species/index.hbs
@@ -24,7 +24,8 @@
           {{/link-to}}
         </td>
         <td>
-          {{#each strain in species.strains}}
+          {{#each species.strains as |strain index|}}
+            {{if index ","}}
             {{#link-to 'strains.show' strain.id}}
               {{strain.strainName}}
             {{/link-to}}