diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl
index 2fee91e1d..1835702b0 100644
--- a/xsl/calendar.xsl
+++ b/xsl/calendar.xsl
@@ -134,11 +134,11 @@
 						<xsl:value-of select="concat('Ort: ', location)"/>
 						<xsl:if test="string-length(date:time(start)) &gt; 0 or string-length(date:time(end)) &gt; 0">
 							<xsl:value-of select="concat('&#xA;', 'Zeit:')" disable-output-escaping="yes"/>
-							<xsl:if test="string-length(date:time(start)) &gt; 0">
-								<xsl:value-of select="concat(' ab ', substring(date:time(start),0,6))"/>
+							<xsl:if test="string-length(date:time(start)) &gt; 0 and substring(date:time(start),1,5) != ''">
+								<xsl:value-of select="concat(' ab ', substring(date:time(start),1,5))"/>
 							</xsl:if>
-							<xsl:if test="string-length(date:time(end)) &gt; 0 and date:time(end) &gt; date:time(start)">
-								<xsl:value-of select="concat('&#160;bis&#160;', substring(date:time(end),0,6))"/>
+							<xsl:if test="string-length(date:time(end)) &gt; 0 and substring(date:time(end),1,5) != '' and substring(date:time(end),1,5) !=  substring(date:time(start),1,5)">
+								<xsl:value-of select="concat('&#160;bis&#160;', substring(date:time(end),1,5))"/>
 							</xsl:if>
 						</xsl:if>
 					</xsl:attribute>