diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/create.ts b/packages/grafana-toolkit/src/cli/tasks/plugin/create.ts
index 35280529bf3..87a0cea5fbb 100644
--- a/packages/grafana-toolkit/src/cli/tasks/plugin/create.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/plugin/create.ts
@@ -29,7 +29,10 @@ const RepositoriesPaths = {
   'datasource-plugin': 'https://github.com/grafana/simple-datasource.git',
 };
 
-export const getGitUsername = async () => await simpleGit.raw(['config', '--global', 'user.name']);
+export const getGitUsername = async () => {
+  const name = await simpleGit.raw(['config', '--global', 'user.name']);
+  return name || '';
+};
 export const getPluginIdFromName = (name: string) => kebabCase(name);
 export const getPluginId = (pluginDetails: PluginDetails) =>
   `${kebabCase(pluginDetails.org)}-${getPluginIdFromName(pluginDetails.name)}`;