diff --git a/src/main/webapp/templates/forecastConfigurationList.ftl b/src/main/webapp/templates/forecastConfigurationList.ftl
index f7a4459f7ab803b2f9bb27bb0adcaae900dd4a48..2c3b22995206a9fbd05c424ea387be2d4667473d 100755
--- a/src/main/webapp/templates/forecastConfigurationList.ftl
+++ b/src/main/webapp/templates/forecastConfigurationList.ftl
@@ -90,7 +90,7 @@
 				</#if>
 		    	</td>
 		    	<td>${forecastConfiguration.locationPointOfInterestId.name}</td>
-		    	<td>${forecastConfiguration.weatherStationPointOfInterestId.name}</td>
+		    	<td><#if forecastConfiguration.weatherStationPointOfInterestId?has_content>${forecastConfiguration.weatherStationPointOfInterestId.name}</#if></td>
 		    	<td>${forecastConfiguration.dateStart}</td>
 		    	<td>${forecastConfiguration.dateEnd}</td>
 		    </tr>
@@ -119,7 +119,7 @@
 				</#if>
 		    	</td>
 		    	<td>${forecastConfiguration.locationPointOfInterestId.name}</td>
-		    	<td>${forecastConfiguration.weatherStationPointOfInterestId.name}</td>
+		    	<td><#if forecastConfiguration.weatherStationPointOfInterestId?has_content>${forecastConfiguration.weatherStationPointOfInterestId.name}</#if></td>
 		    	<td>${forecastConfiguration.dateStart}</td>
 		    	<td>${forecastConfiguration.dateEnd}</td>
 		    </tr>