diff --git a/client/src/components/formHelpers/form.tsx b/client/src/components/formHelpers/form.tsx
index a604175dd50..516ac60e941 100644
--- a/client/src/components/formHelpers/form.tsx
+++ b/client/src/components/formHelpers/form.tsx
@@ -103,7 +103,6 @@ export const StrictSolutionForm = ({
           <FormFields formFields={formFields} options={options} />
           <BlockSaveButton
             disabled={(pristine && !enableSubmit) || (error as boolean)}
-            bgSize='none'
           >
             {buttonText}
           </BlockSaveButton>
diff --git a/client/src/templates/Challenges/redux/selectors.js b/client/src/templates/Challenges/redux/selectors.js
index 8515685af8e..dfb14bc9cd6 100644
--- a/client/src/templates/Challenges/redux/selectors.js
+++ b/client/src/templates/Challenges/redux/selectors.js
@@ -101,6 +101,10 @@ export const currentBlockIdsSelector = state => {
     challengeType
   );
 
+  if (!currentBlockIds) {
+    return [];
+  }
+
   return currentBlockIds;
 };