diff --git a/public/app/features/explore/QueryLibrary/QueryTemplatesTable/AddedByCell.tsx b/public/app/features/explore/QueryLibrary/QueryTemplatesTable/AddedByCell.tsx
index a0d5c497c88..2d4bd8f060c 100644
--- a/public/app/features/explore/QueryLibrary/QueryTemplatesTable/AddedByCell.tsx
+++ b/public/app/features/explore/QueryLibrary/QueryTemplatesTable/AddedByCell.tsx
@@ -12,7 +12,7 @@ export function AddedByCell(props: AddedByCellProps) {
 
   return (
     <div>
-      <span className={styles.otherText}>{props.user?.login || 'Unknown'}</span>
+      <span className={styles.otherText}>{props.user?.login || `UserId: ${props.user?.userId}` || 'Unknown'}</span>
     </div>
   );
 }
diff --git a/public/app/features/explore/QueryLibrary/QueryTemplatesTable/types.ts b/public/app/features/explore/QueryLibrary/QueryTemplatesTable/types.ts
index 0f9041fa533..0c28b4418bc 100644
--- a/public/app/features/explore/QueryLibrary/QueryTemplatesTable/types.ts
+++ b/public/app/features/explore/QueryLibrary/QueryTemplatesTable/types.ts
@@ -9,4 +9,5 @@ export type QueryTemplateRow = {
   datasourceType?: string;
   createdAtTimestamp?: number;
   user?: User;
+  uid?: string;
 };
diff --git a/public/app/features/query-library/api/mappers.ts b/public/app/features/query-library/api/mappers.ts
index 3c9d8d8a206..88a1299b204 100644
--- a/public/app/features/query-library/api/mappers.ts
+++ b/public/app/features/query-library/api/mappers.ts
@@ -12,7 +12,7 @@ export const parseCreatedByValue = (value?: string) => {
         return undefined;
       } else {
         return {
-          userId: Number(vals[1]),
+          userId: vals[1],
           login: vals[2],
         };
       }
diff --git a/public/app/features/query-library/api/types.ts b/public/app/features/query-library/api/types.ts
index 01a5c6a9635..9ba5276bfa5 100644
--- a/public/app/features/query-library/api/types.ts
+++ b/public/app/features/query-library/api/types.ts
@@ -27,7 +27,7 @@ export type DataQuerySpecResponse = {
 };
 
 export type User = {
-  userId?: number;
+  userId?: string;
   login?: string;
 };