diff --git a/backend/modules/graphql.js b/backend/modules/graphql.js
index 7455cea87..b384c0ffb 100644
--- a/backend/modules/graphql.js
+++ b/backend/modules/graphql.js
@@ -80,8 +80,7 @@ module.exports = app => {
     const server = new ApolloServer({
         schema,
         playground: false,
-        // TODO make instrospection false in production
-        introspection: true,
+        introspection: false,
         context: ({ req, res }) => ({
             req,
             res,
diff --git a/frontend/src/components/inputs/BottomBar.js b/frontend/src/components/inputs/BottomBar.js
index c650d46cf..44960a2ff 100644
--- a/frontend/src/components/inputs/BottomBar.js
+++ b/frontend/src/components/inputs/BottomBar.js
@@ -97,6 +97,7 @@ const BottomBar = ({
                     <Button
                         color="theme_white"
                         variant="contained"
+                        disabled={loading}
                         onClick={onSubmit}
                     >
                         {submitLabel}
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js b/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js
index 3dd21d94c..3873a6677 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js
@@ -327,9 +327,9 @@ const SubmissionForm = props => {
                             autoHideDuration: 3000,
                         }),
                     )
+                } finally {
+                    actions.setSubmitting(false)
                 }
-
-                actions.setSubmitting(false)
             }}
         >
             {renderForm}