diff --git a/src/dashboardWebView/components/DataView/DataView.tsx b/src/dashboardWebView/components/DataView/DataView.tsx
index 8551d79c..3d07f144 100644
--- a/src/dashboardWebView/components/DataView/DataView.tsx
+++ b/src/dashboardWebView/components/DataView/DataView.tsx
@@ -149,9 +149,9 @@ export const DataView: React.FunctionComponent<IDataViewProps> = (props: React.P
                   <div className={`divide-y divide-gray-200 dark:divide-vulcan-300 border-t border-b border-gray-200 dark:border-vulcan-300`}>
                     {
                       (dataFiles && dataFiles.length > 0) && (
-                        dataFiles.map((dataFile) => (
+                        dataFiles.map((dataFile, idx) => (
                           <button
-                            key={dataFile.id}
+                            key={`${dataFile.id}-${idx}`}
                             type='button'
                             className={`px-4 py-2 flex items-center text-sm font-medium w-full text-left hover:bg-gray-200 dark:hover:bg-vulcan-400 hover:text-vulcan-500 dark:hover:text-whisper-500 ${selectedData?.id === dataFile.id ? 'bg-gray-300 dark:bg-vulcan-300 text-vulcan-500 dark:text-whisper-500' : 'text-gray-500 dark:text-whisper-900'}`}
                             onClick={() => setSchema(dataFile)}>
diff --git a/src/helpers/DataFileHelper.ts b/src/helpers/DataFileHelper.ts
index c4080ad7..e7c59d12 100644
--- a/src/helpers/DataFileHelper.ts
+++ b/src/helpers/DataFileHelper.ts
@@ -58,7 +58,7 @@ export class DataFileHelper {
       if (fileType === "yaml") {
         return yaml.safeLoad(dataFile || "");
       } else {
-        return dataFile ? JSON.parse(dataFile) : [];
+        return dataFile ? JSON.parse(dataFile) : undefined;
       }
     } catch (ex) {
       Logger.error(`DataFileHelper::process: ${(ex as Error).message}`);
diff --git a/src/listeners/dashboard/DataListener.ts b/src/listeners/dashboard/DataListener.ts
index 6e61600b..4497e0ac 100644
--- a/src/listeners/dashboard/DataListener.ts
+++ b/src/listeners/dashboard/DataListener.ts
@@ -56,7 +56,7 @@ export class DataListener extends BaseListener {
    * @param msgData 
    */
   private static async processDataFile(msgData: DataFile) {
-    const entries = DataFileHelper.process(msgData);
+    const entries = await DataFileHelper.process(msgData);
     this.sendMsg(DashboardCommand.dataFileEntries, entries);
   }
 }
\ No newline at end of file