diff --git a/src/Analysis/AnalysisApp.jsx b/src/Analysis/AnalysisApp.jsx
index d4d606e16..6ae96918d 100644
--- a/src/Analysis/AnalysisApp.jsx
+++ b/src/Analysis/AnalysisApp.jsx
@@ -138,7 +138,9 @@ class AnalysisApp extends React.Component {
     case 'AtlasDataDictionary': {
       return (
         <div className='analysis-app_flex_row'>
-          <AtlasDataDictionaryContainer />
+          <AtlasDataDictionaryContainer
+            dataDictionaryVersion={analysisApps[app].dataDictionaryVersion}
+          />
         </div>
       );
     }
diff --git a/src/Analysis/AtlasDataDictionary/AtlasDataDictionaryContainer.tsx b/src/Analysis/AtlasDataDictionary/AtlasDataDictionaryContainer.tsx
index 7e925853a..d2c71229c 100644
--- a/src/Analysis/AtlasDataDictionary/AtlasDataDictionaryContainer.tsx
+++ b/src/Analysis/AtlasDataDictionary/AtlasDataDictionaryContainer.tsx
@@ -1,13 +1,23 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { useLocation, useHistory, useRouteMatch } from 'react-router-dom';
 import ProtectedContent from '../../Login/ProtectedContent';
 import AtlasDataDictionaryLoading from './AtlasDataDictionaryTable/AtlasDataDictionaryLoading';
+import AtlasDataDictionaryButton from './AtlasDataDictionaryButton/AtlasDataDictionaryButton';
 import './AtlasDataDictionary.css';
 
-const AtlasDataDictionaryContainer = () => {
+const AtlasDataDictionaryContainer = ({ dataDictionaryVersion }) => {
   const location = useLocation();
   const history = useHistory();
   const match = useRouteMatch();
+
+  if (!dataDictionaryVersion || !dataDictionaryVersion.includes('new')) {
+    // Default legacy component: render a div with AtlasDataDictionaryButton when
+    // no dataDictionaryVersion is set or it does not include 'new':
+    return (
+      <div style={{ width: '100%' }}><AtlasDataDictionaryButton /></div>
+    );
+  }
   return (
     <div className='atlas-data-dictionary-container'>
       <ProtectedContent
@@ -21,4 +31,12 @@ const AtlasDataDictionaryContainer = () => {
   );
 };
 
+AtlasDataDictionaryContainer.propTypes = {
+  dataDictionaryVersion: PropTypes.string,
+};
+
+AtlasDataDictionaryContainer.defaultProps = {
+  dataDictionaryVersion: null,
+};
+
 export default AtlasDataDictionaryContainer;