diff --git a/src/@optimizely/forms-react/src/components/elements/SubmitButtonElementBlock.tsx b/src/@optimizely/forms-react/src/components/elements/SubmitButtonElementBlock.tsx
index 4526094..934f34e 100644
--- a/src/@optimizely/forms-react/src/components/elements/SubmitButtonElementBlock.tsx
+++ b/src/@optimizely/forms-react/src/components/elements/SubmitButtonElementBlock.tsx
@@ -14,23 +14,21 @@ export const SubmitButtonElementBlock = (props: SubmitButtonElementBlockProps) =
     //TODO: Need to get submittable status from API
     const buttonDisableState = false;
 
-    return useMemo(()=>(
-        <ElementWrapper isVisible={isVisible}>
-            <button id={element.key}
-                name="submit"
-                type="submit"
-                value={element.key}
-                {...extraAttr}
-                disabled={buttonDisableState}
-                className={isNullOrEmpty(element.properties.image) 
-                    ? `Form__Element FormExcludeDataRebind FormSubmitButton ${validatorClasses}` 
-                    : `Form__Element FormExcludeDataRebind FormSubmitButton FormImageSubmitButton ${validatorClasses}`
-                }
-            >
-                {isNullOrEmpty(element.properties.image) ? element.properties.label : (
-                    <img src={element.properties.image} alt={element.properties.label} />
-                )}
-            </button>
-        </ElementWrapper>
-    ),[isVisible]);
+    return useMemo(()=>(isVisible && (
+        <button id={element.key}
+            name="submit"
+            type="submit"
+            value={element.key}
+            {...extraAttr}
+            disabled={buttonDisableState}
+            className={isNullOrEmpty(element.properties.image) 
+                ? `Form__Element FormExcludeDataRebind FormSubmitButton ${validatorClasses}` 
+                : `Form__Element FormExcludeDataRebind FormSubmitButton FormImageSubmitButton ${validatorClasses}`
+            }
+        >
+            {isNullOrEmpty(element.properties.image) ? element.properties.label : (
+                <img src={element.properties.image} alt={element.properties.label} />
+            )}
+        </button>
+    )),[isVisible]);
 }
\ No newline at end of file