diff --git a/frontend/src/metadata/metadata-view/components/view/index.js b/frontend/src/metadata/metadata-view/components/view/index.js
index 7017dde11b..0096fc7745 100644
--- a/frontend/src/metadata/metadata-view/components/view/index.js
+++ b/frontend/src/metadata/metadata-view/components/view/index.js
@@ -10,9 +10,18 @@ const View = () => {
   const { isLoading, metadata, errorMsg } = useMetadata();
 
   const renderView = useCallback((metadata) => {
+    if (!metadata) return false;
     const viewType = metadata.view.type;
-    if (viewType === VIEW_TYPE.GALLERY) return (<Gallery />);
-    return (<Table />);
+    switch (viewType) {
+      case VIEW_TYPE.GALLERY: {
+        return <Gallery />;
+      }
+      case VIEW_TYPE.TABLE: {
+        return <Table />;
+      }
+      default:
+        return null;
+    }
   }, []);
 
   if (isLoading) return (<CenteredLoading />);
@@ -20,8 +29,7 @@ const View = () => {
   return (
     <div className="sf-metadata-wrapper">
       <div className="sf-metadata-main">
-        {errorMsg && (<div className="d-center-middle error">{gettext(errorMsg)}</div>)}
-        {!errorMsg && renderView(metadata)}
+        {errorMsg ? <div className="d-center-middle error">{gettext(errorMsg)}</div> : renderView(metadata)}
       </div>
     </div>
   );
diff --git a/frontend/src/metadata/metadata-view/context.js b/frontend/src/metadata/metadata-view/context.js
index d6d20545bc..b366e88600 100644
--- a/frontend/src/metadata/metadata-view/context.js
+++ b/frontend/src/metadata/metadata-view/context.js
@@ -70,7 +70,7 @@ class Context {
   // metadata
   getMetadata = (params) => {
     const repoID = this.settings['repoID'];
-    return this.metadataAPI.getMetadata(repoID, params);
+    return this.metadataAPI ? this.metadataAPI.getMetadata(repoID, params) : null;
   };
 
   getRecord = (parentDir, fileName) => {