diff --git a/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.ts b/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.ts
index ba245e9..b1eec3a 100644
--- a/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.ts
+++ b/templates/Angular2Spa/ClientApp/components/fetch-data/fetch-data.ts
@@ -9,11 +9,13 @@ export class FetchData {
     public forecasts: WeatherForecast[];
 
     constructor(http: Http) {
+        // Workaround for RC1 bug. This can be removed with ASP.NET Core 1.0 RC2.
+        let isServerSide = typeof window === 'undefined';
+        let options: any = isServerSide ? { headers: { Connection: 'keep-alive' } } : null;
+        
         // TODO: Switch to relative URL once angular-universal supports them
         // https://github.com/angular/universal/issues/348
-        http.get('http://localhost:5000/api/SampleData/WeatherForecasts', {
-            headers: <any>{ Connection: 'keep-alive' } // Workaround for RC1 bug. TODO: Remove this after updating to RC2
-        }).subscribe(result => {
+        http.get('http://localhost:5000/api/SampleData/WeatherForecasts', options).subscribe(result => {
             this.forecasts = result.json();
         });
     }