diff --git a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6 b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
index 6352b3b2..28a1c825 100644
--- a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js.es6
@@ -24,6 +24,18 @@ export default Controller.extend({
         this.set("loadingMore", false);
       });
   },
+  
+  
+  @discourseComputed('submissions', 'fields.@each.enabled')
+  displaySubmissions(submissions, fields) {
+    return submissions.map(submission => {
+      let field = fields.find(f => Object.keys(submission).includes(f.id));
+      if (!field.enabled) {
+        submission.delete(field.id);
+      };
+      return submission;
+    });
+  },
 
   actions: {
     loadMore() {