diff --git a/CHANGES.md b/CHANGES.md
index 115da9a9..07db71ca 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-### 0.x.x (2014-11-10 xx:xx:xx UTC)
+### 0.x.x (2014-11-11 xx:xx:xx UTC)
 
 * Add Bootstrap for UI features
 * Change UI to resize fluidly on different display sizes, fixes the issue where top menu items would disappear on smaller screens
@@ -53,6 +53,7 @@
 * Fix missing url for kickasstorrents in config_providers
 * Fix post processing when using tvrage indexer and mediabrowser metadata generation
 * Change reporting failed network_timezones.txt updates from an error to a warning
+* Fix missing header and "on <missing text>" when network is none and Layout "Poster" with Sort By "Network" on coming episodes page.
 
 [develop changelog]
 * Change improve display of progress bars in the Downloads columns of the show list page
diff --git a/gui/slick/interfaces/default/comingEpisodes.tmpl b/gui/slick/interfaces/default/comingEpisodes.tmpl
index f95a4cca..e278593b 100644
--- a/gui/slick/interfaces/default/comingEpisodes.tmpl
+++ b/gui/slick/interfaces/default/comingEpisodes.tmpl
@@ -322,10 +322,11 @@
     #set $runtime = $cur_result['runtime']
 
     #if 'network' == $sort:
-        #if $cur_result['network'] and $cur_segment != $cur_result['network']:
+        #set $show_network = $cur_result['network'] if $cur_result['network'] else 'no network'
+        #if $cur_segment != $show_network:
 			<div class="comingepheader">
-				<br><h2 class="network">$cur_result['network']</h2>
-                #set $cur_segment = $cur_result['network']
+				<br><h2 class="network">$show_network</h2>
+            #set $cur_segment = $cur_result['network']
         #end if
         #set $cur_ep_airdate = $cur_result['localtime'].date()
 
@@ -440,7 +441,7 @@
 
 				<div class="clearfix">
 
-					<span class="title">Airs: </span><span class="${fuzzydate}">$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)</span><span> on $cur_result['network']</span>
+					<span class="title">Airs: </span><span class="${fuzzydate}">$sbdatetime.sbdatetime.sbfdatetime($cur_result['localtime']).decode($sickbeard.SYS_ENCODING)</span><%= ('', '<span> on %s</span>' % str(cur_result['network']))[None is not cur_result['network']] %>
 				</div>
 
 				<div class="clearfix">