diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 3d3b5943844..ce333e9fff1 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -66,7 +66,7 @@ gulp.task('hugo-staging', (cb) => {
 });
 
 gulp.task('hugo-dev', (cb) => {
-  return spawn('hugo', ['--buildDrafts', '--buildFuture', '--baseURL=http://localhost:9001'], { stdio: 'inherit' }).on('close', (/* code */) => {
+  return spawn('hugo', ['--buildDrafts', '--buildFuture', '--baseURL='], { stdio: 'inherit' }).on('close', (/* code */) => {
     browserSync.reload();
     cb();
   });
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index c7e31123e75..2d702763752 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -92,11 +92,13 @@
         <div class="p-v-xs">{{ partial "page-edit.html" . }}</div>
 
       </article>
-      <div class="offset-watch invisible"></div>
-      <aside class="col-sm-2 col-xs-12 unstyled toc-container hidden-md">
-        <h4 class="m-b-0">On this page</h4>
-        {{ .TableOfContents }}
-      </aside>
+      {{ with .TableOfContents }}
+        <div class="offset-watch invisible"></div>
+        <aside class="col-sm-2 col-xs-12 unstyled toc-container hidden-md">
+          <h4 class="m-b-0">On this page</h4>
+          {{ . }}
+        </aside>
+      {{ end }}
     </div>
   </div>
 {{ end }}