diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 74b434cdbf..0ef9331338 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import Matrix from 'matrix-js-sdk';
 import * as sdk from '../../index';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
-import {EventIndexPeg} from "../../indexing/EventIndexPeg";
+import EventIndexPeg from "../../indexing/EventIndexPeg";
 import { _t } from '../../languageHandler';
 
 /*
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 7263d8b2c4..cb2f646d07 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -17,11 +17,9 @@ limitations under the License.
 import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
 
-import Matrix from 'matrix-js-sdk';
-import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set';
-import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
-import MatrixEvent from 'matrix-js-sdk/lib/models/event';
-import RoomMember from 'matrix-js-sdk/lib/models/room-member';
+import * as Matrix from 'matrix-js-sdk';
+import {EventTimelineSet} from 'matrix-js-sdk';
+import {EventTimeline} from 'matrix-js-sdk';
 
 /*
  * Event indexing class that wraps the platform specific event indexing.
@@ -448,7 +446,7 @@ export default class EventIndex {
         const matrixEvents = events.map(e => {
             const matrixEvent = eventMapper(e.event);
 
-            const member = new RoomMember(room.roomId, matrixEvent.getSender());
+            const member = new Matrix.RoomMember(room.roomId, matrixEvent.getSender());
 
             // We can't really reconstruct the whole room state from our
             // EventIndex to calculate the correct display name. Use the