diff --git a/client/views/battle_team_preview.jade b/client/views/battle_team_preview.jade
index 594751c..eeea078 100644
--- a/client/views/battle_team_preview.jade
+++ b/client/views/battle_team_preview.jade
@@ -1,14 +1,14 @@
 mixin displayOtherTeam(team, text)
   - var teamvisible = team.collection.parents[0].get('visibleteam')
   - var isdef = typeof teamvisible
-  if isdef != 'undefined' && teamvisible
-    section.battle_team_preview
-      p= text
-      ul.row-fluid.unstyled
-        - team.get('pokemon').each(function(pokemon) {
-          li.px_40
-             +displayPokemon(pokemon)
-        - })
+  section.battle_team_preview
+    p= text
+    ul.row-fluid.unstyled
+    if isdef != 'undefined' && teamvisible
+      - team.get('pokemon').each(function(pokemon) {
+        li.px_40
+           +displayPokemon(pokemon)
+      - })
 
 mixin displayYourTeam(team, text)
   section.battle_team_preview
diff --git a/public/js/templates.js b/public/js/templates.js
index 2548007..4ca2dd8 100644
--- a/public/js/templates.js
+++ b/public/js/templates.js
@@ -295,9 +295,9 @@ var locals_ = (locals || {}),battle = locals_.battle,window = locals_.window;var
 var block = this.block, attributes = this.attributes || {}, escaped = this.escaped || {};
 var teamvisible = team.collection.parents[0].get('visibleteam')
 var isdef = typeof teamvisible
+buf.push("<section class=\"battle_team_preview\"><p>" + (jade.escape(null == (jade.interp = text) ? "" : jade.interp)) + "</p><ul class=\"row-fluid unstyled\"></ul>");
 if ( isdef != 'undefined' && teamvisible)
 {
-buf.push("<section class=\"battle_team_preview\"><p>" + (jade.escape(null == (jade.interp = text) ? "" : jade.interp)) + "</p><ul class=\"row-fluid unstyled\">");
 team.get('pokemon').each(function(pokemon) {
 {
 buf.push("<li class=\"px_40\">");
@@ -305,8 +305,8 @@ displayPokemon_mixin(pokemon);
 buf.push("</li>");
 }
 })
-buf.push("</ul></section>");
 }
+buf.push("</section>");
 };
 var displayYourTeam_mixin = function(team, text){
 var block = this.block, attributes = this.attributes || {}, escaped = this.escaped || {};
diff --git a/server/server.coffee b/server/server.coffee
index 49663f3..ce06a98 100644
--- a/server/server.coffee
+++ b/server/server.coffee
@@ -19,7 +19,6 @@ alts = require './alts'
 achievements = require './achievements'
 
 FIND_BATTLE_CONDITIONS = [
-  Conditions.TEAM_PREVIEW
   Conditions.RATED_BATTLE
   Conditions.TIMED_BATTLE
   Conditions.SLEEP_CLAUSE
@@ -31,7 +30,6 @@ FIND_BATTLE_CONDITIONS = [
 ]
 
 FIND_BATTLE_CONDITIONS_UNRANKED = [
-  Conditions.TEAM_PREVIEW
   Conditions.TIMED_BATTLE
   Conditions.SLEEP_CLAUSE
   Conditions.EVASION_CLAUSE