diff --git a/packages/my-joy-beta/src/containers/create-instance/cns.js b/packages/my-joy-beta/src/containers/create-instance/cns.js
index b62ac833..c751f124 100644
--- a/packages/my-joy-beta/src/containers/create-instance/cns.js
+++ b/packages/my-joy-beta/src/containers/create-instance/cns.js
@@ -145,14 +145,18 @@ const CNSContainer = ({
         <Margin bottom={4}>
           <H3>{cnsEnabled ? 'CNS Enabled' : 'CNS Not Enabled'}</H3>
         </Margin>
-        <FormLabel>Existing CNS service name(s)</FormLabel>
-        <Margin top={0.5}>
-          <TagList>
-            {serviceNames.map((value, index) => (
-              <Tag key={index} value={value} />
-            ))}
-          </TagList>
-        </Margin>
+        {cnsEnabled ? (
+          <Fragment>
+            <FormLabel>Existing CNS service name(s)</FormLabel>
+            <Margin top={0.5}>
+              <TagList>
+                {serviceNames.map((value, index) => (
+                  <Tag key={index} value={value} />
+                ))}
+              </TagList>
+            </Margin>
+          </Fragment>
+        ) : null}
         <Button type="button" onClick={handleEdit} secondary>
           Edit
         </Button>
diff --git a/packages/my-joy-beta/src/containers/create-instance/networks.js b/packages/my-joy-beta/src/containers/create-instance/networks.js
index 9fd4eb9e..dcea73f9 100644
--- a/packages/my-joy-beta/src/containers/create-instance/networks.js
+++ b/packages/my-joy-beta/src/containers/create-instance/networks.js
@@ -130,7 +130,7 @@ export default compose(
           set({ name: 'create-instance-networks-proceeded', value: true })
         );
 
-        return history.push('/instances/~create/firewall');
+        return history.push('/instances/~create/cns');
       },
       handleEdit: () => {
         return history.push('/instances/~create/networks');