diff --git a/Resources/Private/Partials/Event/Detail.html b/Resources/Private/Partials/Event/Detail.html
index 084c68c7..e226245f 100644
--- a/Resources/Private/Partials/Event/Detail.html
+++ b/Resources/Private/Partials/Event/Detail.html
@@ -52,7 +52,14 @@ <h3 class="state-{index.state}">
 	<f:if condition="{event.images}">
 		<div class="images">
 			<f:for each="{event.images}" as="image" iteration="i">
-				<f:image src="{image.uid}" treatIdAsReference="1" alt="" maxWidth="300" class="img-rounded"/>
+				<f:if condition="{image.originalResource.type}==4">
+                    <f:then>
+                        <f:media file="{image}" />
+                    </f:then>
+                    <f:else>
+                        <f:image image="{image}" alt="" maxWidth="300" class="img-rounded"/>
+                    </f:else>
+                </f:if>
 			</f:for>
 		</div>
 	</f:if>
diff --git a/Resources/Private/Partials/Event/ListItem.html b/Resources/Private/Partials/Event/ListItem.html
index eca80d96..53394ed7 100644
--- a/Resources/Private/Partials/Event/ListItem.html
+++ b/Resources/Private/Partials/Event/ListItem.html
@@ -8,7 +8,14 @@
 				<f:for each="{event.images}" as="image" iteration="i">
 					<f:if condition="{i.isFirst}">
 						<c:link.index index="{index}">
-							<f:image src="{image.uid}" treatIdAsReference="1" alt="" maxWidth="160" maxHeight="160" class="media-object img-rounded" />
+	                  		<f:if condition="{image.originalResource.type}==4">
+	                            <f:then>
+	                                <f:media file="{image}" />
+	                            </f:then>
+	                            <f:else>
+	                                <f:image image="{image}" alt="" maxWidth="160" maxHeight="160" class="media-object img-rounded" />
+	                            </f:else>
+	                        </f:if>
 						</c:link.index>
 					</f:if>
 				</f:for>