diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index 7ab528877b1..3f3a2c480b8 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -374,11 +374,10 @@ async function getDataSource(
     return datasource;
   }
 
-  // TODO: Retrieve datasource to pass as argument to PublicDashboardDataSource
-  // const ds = await getDatasourceSrv().get(datasource, scopedVars);
+  const ds = await getDatasourceSrv().get(datasource, scopedVars);
   if (publicDashboardAccessToken) {
-    return new PublicDashboardDataSource(datasource);
+    return new PublicDashboardDataSource(ds);
   }
 
-  return await getDatasourceSrv().get(datasource, scopedVars);
+  return ds;
 }