diff --git a/packages/grafana-runtime/src/utils/plugin.ts b/packages/grafana-runtime/src/utils/plugin.ts
index 6e73829277a..1e12cb75850 100644
--- a/packages/grafana-runtime/src/utils/plugin.ts
+++ b/packages/grafana-runtime/src/utils/plugin.ts
@@ -10,10 +10,7 @@ export interface PluginCssOptions {
 
 export const SystemJS = System;
 
-export function loadPluginCss(options: PluginCssOptions) {
-  if (config.bootData.user.lightTheme) {
-    SystemJS.import(`${options.light}!css`);
-  } else {
-    SystemJS.import(`${options.dark}!css`);
-  }
+export function loadPluginCss(options: PluginCssOptions): Promise<any> {
+  const theme = config.bootData.user.lightTheme ? options.light : options.dark;
+  return SystemJS.import(`${theme}!css`);
 }