diff --git a/src/components/structures/FilePanel.tsx b/src/components/structures/FilePanel.tsx
index 7ee0ab04eb..54f8696370 100644
--- a/src/components/structures/FilePanel.tsx
+++ b/src/components/structures/FilePanel.tsx
@@ -296,18 +296,20 @@ class FilePanel extends React.Component<IProps, IState> {
                             <Measured sensor={this.card.current} onMeasurement={this.onMeasurement} />
                         )}
                         {isRoomEncryptedLoaded && (
-                            <SearchWarning isRoomEncrypted={isRoomEncrypted} kind={WarningKind.Files} />
+                            <>
+                                <SearchWarning isRoomEncrypted={isRoomEncrypted} kind={WarningKind.Files} />
+                                <TimelinePanel
+                                    manageReadReceipts={false}
+                                    manageReadMarkers={false}
+                                    timelineSet={this.state.timelineSet}
+                                    showUrlPreview={false}
+                                    onPaginationRequest={this.onPaginationRequest}
+                                    resizeNotifier={this.props.resizeNotifier}
+                                    empty={emptyState}
+                                    layout={Layout.Group}
+                                />
+                            </>
                         )}
-                        <TimelinePanel
-                            manageReadReceipts={false}
-                            manageReadMarkers={false}
-                            timelineSet={this.state.timelineSet}
-                            showUrlPreview={false}
-                            onPaginationRequest={this.onPaginationRequest}
-                            resizeNotifier={this.props.resizeNotifier}
-                            empty={emptyState}
-                            layout={Layout.Group}
-                        />
                     </BaseCard>
                 </RoomContext.Provider>
             );