diff --git a/extensions/flags/js/forum/src/components/FlagList.js b/extensions/flags/js/forum/src/components/FlagList.js
index 05823dc96..1e5db1971 100644
--- a/extensions/flags/js/forum/src/components/FlagList.js
+++ b/extensions/flags/js/forum/src/components/FlagList.js
@@ -70,12 +70,11 @@ export default class FlagList extends Component {
     this.loading = true;
     m.redraw();
 
-    app.store.find('flags').then(flags => {
-      app.session.user.pushAttributes({newFlagsCount: 0});
-      app.cache.flags = flags.sort((a, b) => b.time() - a.time());
-
-      this.loading = false;
-      m.redraw();
-    });
+    app.store.find('flags')
+      .then(flags => {
+        app.session.user.pushAttributes({newFlagsCount: 0});
+        app.cache.flags = flags.sort((a, b) => b.time() - a.time());
+      })
+      .finally(this.loaded.bind(this));
   }
 }
diff --git a/extensions/flags/js/forum/src/components/FlagPostModal.js b/extensions/flags/js/forum/src/components/FlagPostModal.js
index 1f9579102..1f47797bb 100644
--- a/extensions/flags/js/forum/src/components/FlagPostModal.js
+++ b/extensions/flags/js/forum/src/components/FlagPostModal.js
@@ -77,10 +77,7 @@ export default class FlagPostModal extends Modal {
       }
     }).then(
       () => this.hide(),
-      () => {
-        this.loading = false;
-        m.redraw();
-      }
+      this.loaded.bind(this)
     );
   }
 }