diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 974c5b6f51..f1713ca51f 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -19,9 +19,9 @@ limitations under the License.
 
 import {MatrixClient, MemoryStore} from 'matrix-js-sdk';
 
-import utils from 'matrix-js-sdk/lib/utils';
-import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
-import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set';
+import * as utils from 'matrix-js-sdk/lib/utils';
+import {EventTimeline} from 'matrix-js-sdk/lib/models/event-timeline';
+import {EventTimelineSet} from 'matrix-js-sdk/lib/models/event-timeline-set';
 import * as sdk from './index';
 import createMatrixClient from './utils/createMatrixClient';
 import SettingsStore from './settings/SettingsStore';
diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index 5bef4afd25..9fe8bd75e4 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import MatrixClientPeg from './MatrixClientPeg';
-import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
+import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor';
 
 export const ALL_MESSAGES_LOUD = 'all_messages_loud';
 export const ALL_MESSAGES = 'all_messages';
diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js
index e78b67e847..0e24b4baac 100644
--- a/src/settings/controllers/NotificationControllers.js
+++ b/src/settings/controllers/NotificationControllers.js
@@ -18,7 +18,7 @@ import SettingController from "./SettingController";
 import MatrixClientPeg from '../../MatrixClientPeg';
 
 // XXX: This feels wrong.
-import PushProcessor from "matrix-js-sdk/lib/pushprocessor";
+import {PushProcessor} from "matrix-js-sdk/lib/pushprocessor";
 
 function isMasterRuleEnabled() {
     // Return the value of the master push rule as a default
diff --git a/src/utils/StorageManager.js b/src/utils/StorageManager.js
index 49a120a470..39466d66ce 100644
--- a/src/utils/StorageManager.js
+++ b/src/utils/StorageManager.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import Matrix from 'matrix-js-sdk';
-import LocalStorageCryptoStore from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store';
+import {LocalStorageCryptoStore} from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store';
 import Analytics from '../Analytics';
 
 const localStorage = window.localStorage;
diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index aec7243236..25845f93a0 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import MatrixClientPeg from "../../MatrixClientPeg";
 import isIp from "is-ip";
-import utils from 'matrix-js-sdk/lib/utils';
+import * as utils from 'matrix-js-sdk/lib/utils';
 import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
 import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
 import RiotPermalinkConstructor from "./RiotPermalinkConstructor";
diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index 524b0f75bb..d0675e4097 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -17,7 +17,7 @@ limitations under the License.
 import ReactDOM from 'react-dom';
 import MatrixClientPeg from '../MatrixClientPeg';
 import SettingsStore from "../settings/SettingsStore";
-import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
+import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor';
 import * as sdk from '../index';
 
 export function pillifyLinks(nodes, mxEvent) {