diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx
index 6d23220bafa..a26d2732195 100644
--- a/src/stores/RoomViewStore.tsx
+++ b/src/stores/RoomViewStore.tsx
@@ -545,8 +545,8 @@ export class RoomViewStore extends EventEmitter {
                     }),
                 NUM_JOIN_RETRY,
                 (err) => {
-                    // if we received a Gateway timeout then retry
-                    return err.httpStatus === 504;
+                    // if we received a Gateway timeout or Cloudflare timeout then retry
+                    return err.httpStatus === 504 || err.httpStatus === 524;
                 },
             );