diff --git a/src/components/modal/join/modal.jsx b/src/components/modal/join/modal.jsx
index c8898b4e2..d309433ee 100644
--- a/src/components/modal/join/modal.jsx
+++ b/src/components/modal/join/modal.jsx
@@ -6,15 +6,14 @@ const JoinFlow = require('../../join-flow/join-flow.jsx');
 require('./modal.scss');
 
 const JoinModal = ({
-    isOpen,
     onCompleteRegistration, // eslint-disable-line no-unused-vars
     onRequestClose,
     ...modalProps
 }) => (
     <Modal
+        isOpen
         useStandardSizes
         className="mod-join"
-        isOpen={isOpen}
         onRequestClose={onRequestClose}
         {...modalProps}
     >
@@ -25,7 +24,6 @@ const JoinModal = ({
 );
 
 JoinModal.propTypes = {
-    isOpen: PropTypes.bool,
     onCompleteRegistration: PropTypes.func,
     onRequestClose: PropTypes.func
 };
diff --git a/src/components/navigation/www/navigation.jsx b/src/components/navigation/www/navigation.jsx
index 6c270a458..7bc3ca663 100644
--- a/src/components/navigation/www/navigation.jsx
+++ b/src/components/navigation/www/navigation.jsx
@@ -217,6 +217,7 @@ class Navigation extends React.Component {
                     {this.props.registrationOpen && (
                         this.props.useScratch3Registration ? (
                             <Scratch3Registration
+                                isOpen
                                 key="scratch3registration"
                             />
                         ) : (
diff --git a/src/components/registration/scratch3-registration.jsx b/src/components/registration/scratch3-registration.jsx
index 38e7bb90a..03f53d763 100644
--- a/src/components/registration/scratch3-registration.jsx
+++ b/src/components/registration/scratch3-registration.jsx
@@ -28,10 +28,6 @@ Registration.propTypes = {
     isOpen: PropTypes.bool
 };
 
-const mapStateToProps = state => ({
-    isOpen: state.navigation.registrationOpen
-});
-
 const mapDispatchToProps = dispatch => ({
     handleCloseRegistration: () => {
         dispatch(navigationActions.setRegistrationOpen(false));
@@ -42,6 +38,6 @@ const mapDispatchToProps = dispatch => ({
 });
 
 module.exports = connect(
-    mapStateToProps,
+    () => ({}),
     mapDispatchToProps
 )(Registration);
diff --git a/src/redux/navigation.js b/src/redux/navigation.js
index 5d7ba28c3..0e71090ae 100644
--- a/src/redux/navigation.js
+++ b/src/redux/navigation.js
@@ -18,7 +18,7 @@ const Types = keyMirror({
 });
 
 module.exports.getInitialState = () => ({
-    useScratch3Registration: true,
+    useScratch3Registration: false,
     accountNavOpen: false,
     canceledDeletionOpen: false,
     loginError: null,
diff --git a/src/views/preview/project-view.jsx b/src/views/preview/project-view.jsx
index f35837cb8..f31353bc1 100644
--- a/src/views/preview/project-view.jsx
+++ b/src/views/preview/project-view.jsx
@@ -754,7 +754,9 @@ class Preview extends React.Component {
                         />
                         {this.props.registrationOpen && (
                             this.props.useScratch3Registration ? (
-                                <Scratch3Registration />
+                                <Scratch3Registration
+                                    isOpen
+                                />
                             ) : (
                                 <Registration />
                             )