diff --git a/lib/http-api.js b/lib/http-api.js
index 819065237..2d9d574c8 100644
--- a/lib/http-api.js
+++ b/lib/http-api.js
@@ -45,7 +45,7 @@ module.exports.PREFIX_IDENTITY_V1 = "/_matrix/identity/api/v1";
 /**
  * Construct a MatrixHttpApi.
  * @constructor
- * @param {MatrixClient} client The matrix client instance to use.
+ * @param {EventEmitter} event_emitter The event emitter to use for emitting events
  * @param {Object} opts The options to use for this HTTP API.
  * @param {string} opts.baseUrl Required. The base client-server URL e.g.
  * 'http://localhost:8008'.
@@ -61,10 +61,10 @@ module.exports.PREFIX_IDENTITY_V1 = "/_matrix/identity/api/v1";
  * @param {Object} opts.extraParams Optional. Extra query parameters to send on
  * requests.
  */
-module.exports.MatrixHttpApi = function MatrixHttpApi(client, opts) {
+module.exports.MatrixHttpApi = function MatrixHttpApi(event_emitter, opts) {
     utils.checkObjectHasKeys(opts, ["baseUrl", "request", "prefix"]);
     opts.onlyData = opts.onlyData || false;
-    this.client = client;
+    this.event_emitter = event_emitter;
     this.opts = opts;
     this.uploads = [];
 };
@@ -275,7 +275,7 @@ module.exports.MatrixHttpApi.prototype = {
             callback, method, path, queryParams, data, localTimeoutMs
         ).catch(function(err) {
             if (err.errcode == 'M_UNKNOWN_TOKEN') {
-                self.client.emit("Session.logged_out");
+                self.event_emitter.emit("Session.logged_out");
             }
             throw err;
         });