diff --git a/public/app/features/dashboard/components/Inspector/PanelInspector.tsx b/public/app/features/dashboard/components/Inspector/PanelInspector.tsx
index 7f87cd5a4bc..3d20816f0d7 100644
--- a/public/app/features/dashboard/components/Inspector/PanelInspector.tsx
+++ b/public/app/features/dashboard/components/Inspector/PanelInspector.tsx
@@ -55,32 +55,6 @@ interface State {
   drawerWidth: string;
 }
 
-const getStyles = stylesFactory(() => {
-  return {
-    toolbar: css`
-      display: flex;
-      margin: 8px 0;
-      justify-content: flex-end;
-      align-items: center;
-    `,
-    dataFrameSelect: css`
-      flex-grow: 2;
-    `,
-    downloadCsv: css`
-      margin-left: 16px;
-    `,
-    tabContent: css`
-      height: calc(100% - 32px);
-    `,
-    dataTabContent: css`
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-      width: 100%;
-    `,
-  };
-});
-
 export class PanelInspector extends PureComponent<Props, State> {
   constructor(props: Props) {
     super(props);
@@ -96,12 +70,14 @@ export class PanelInspector extends PureComponent<Props, State> {
 
   async componentDidMount() {
     const { panel } = this.props;
+
     if (!panel) {
       this.onDismiss(); // Try to close the component
       return;
     }
 
     const lastResult = panel.getQueryRunner().getLastResult();
+
     if (!lastResult) {
       this.onDismiss(); // Usually opened from refresh?
       return;
@@ -118,14 +94,17 @@ export class PanelInspector extends PureComponent<Props, State> {
     // Find the first DataSource wanting to show custom metadata
     if (data && targets.length) {
       const queries: Record<string, DataQuery> = {};
+
       for (const target of targets) {
         queries[target.refId] = target;
       }
 
       for (const frame of data) {
         const q = queries[frame.refId];
-        if (q && frame.meta.custom) {
+
+        if (q && frame.meta && frame.meta.custom) {
           const dataSource = await getDataSourceSrv().get(q.datasource);
+
           if (dataSource && dataSource.components?.MetadataInspector) {
             metaDS = dataSource;
             break;
@@ -198,6 +177,7 @@ export class PanelInspector extends PureComponent<Props, State> {
     if (!data || !data.length) {
       return <div>No Data</div>;
     }
+
     const choices = data.map((frame, index) => {
       return {
         value: index,
@@ -284,15 +264,19 @@ export class PanelInspector extends PureComponent<Props, State> {
     const { tab, last, stats } = this.state;
     const error = last?.error;
     const tabs = [];
+
     if (last && last?.series?.length > 0) {
       tabs.push({ label: 'Data', value: InspectTab.Data });
     }
+
     if (this.state.metaDS) {
       tabs.push({ label: 'Meta Data', value: InspectTab.Meta });
     }
+
     if (error && error.message) {
       tabs.push({ label: 'Error', value: InspectTab.Error });
     }
+
     tabs.push({ label: 'Raw JSON', value: InspectTab.Raw });
 
     return (
@@ -341,3 +325,29 @@ export class PanelInspector extends PureComponent<Props, State> {
     );
   }
 }
+
+const getStyles = stylesFactory(() => {
+  return {
+    toolbar: css`
+      display: flex;
+      margin: 8px 0;
+      justify-content: flex-end;
+      align-items: center;
+    `,
+    dataFrameSelect: css`
+      flex-grow: 2;
+    `,
+    downloadCsv: css`
+      margin-left: 16px;
+    `,
+    tabContent: css`
+      height: calc(100% - 32px);
+    `,
+    dataTabContent: css`
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+      width: 100%;
+    `,
+  };
+});