diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 7fe625f8b9cc..2eb7bb19747b 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -376,9 +376,9 @@ class ContentMessages {
                 }
             }
             if (error) {
-                dis.dispatch({action: 'upload_failed', upload: upload});
+                dis.dispatch({action: 'upload_failed', upload, error});
             } else {
-                dis.dispatch({action: 'upload_finished', upload: upload});
+                dis.dispatch({action: 'upload_finished', upload});
             }
         });
     }
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 62d7c2f17808..edd7e02c9670 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -497,7 +497,10 @@ module.exports = React.createClass({
                 break;
             case 'notifier_enabled':
             case 'upload_failed':
-                this._fetchMediaLimits(true);
+                // 413: File was too big or upset the server in some way.
+                if(payload.data.error.http_status === 413) {
+                    this._fetchMediaLimits(true);
+                }
             case 'upload_started':
             case 'upload_finished':
                 this.forceUpdate();