diff --git a/src/matrix/net/HomeServerApi.js b/src/matrix/net/HomeServerApi.js
index 1526c1e2..6454a2a2 100644
--- a/src/matrix/net/HomeServerApi.js
+++ b/src/matrix/net/HomeServerApi.js
@@ -70,7 +70,7 @@ export class HomeServerApi {
             body: bodyString,
         });
 
-        if (options.timeout) {
+        if (options && options.timeout) {
             const timeout = this._createTimeout(options.timeout);
             // abort request if timeout finishes first
             timeout.elapsed().then(