diff --git a/public/app/core/services/AngularLoader.ts b/public/app/core/services/AngularLoader.ts
index ea4487ca296..cd5506a9458 100644
--- a/public/app/core/services/AngularLoader.ts
+++ b/public/app/core/services/AngularLoader.ts
@@ -2,9 +2,13 @@ import angular from 'angular';
 import coreModule from 'app/core/core_module';
 import _ from 'lodash';
 
-import { AngularComponent, AngularLoader } from '@grafana/runtime';
+import {
+  AngularComponent,
+  AngularLoader as AngularLoaderInterface,
+  setAngularLoader as setAngularLoaderInterface,
+} from '@grafana/runtime';
 
-export class AngularLoaderClass implements AngularLoader {
+export class AngularLoader implements AngularLoaderInterface {
   /** @ngInject */
   constructor(private $compile: any, private $rootScope: any) {}
 
@@ -34,4 +38,8 @@ export class AngularLoaderClass implements AngularLoader {
   }
 }
 
-coreModule.service('angularLoader', AngularLoaderClass);
+export function setAngularLoader(v: AngularLoader) {
+  setAngularLoaderInterface(v);
+}
+
+coreModule.service('angularLoader', AngularLoader);
diff --git a/public/app/routes/GrafanaCtrl.ts b/public/app/routes/GrafanaCtrl.ts
index c3c5b71ca68..0550fb09628 100644
--- a/public/app/routes/GrafanaCtrl.ts
+++ b/public/app/routes/GrafanaCtrl.ts
@@ -13,7 +13,7 @@ import appEvents from 'app/core/app_events';
 import { TimeSrv, setTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { KeybindingSrv, setKeybindingSrv } from 'app/core/services/keybindingSrv';
-import { AngularLoader, setAngularLoader } from '@grafana/runtime';
+import { AngularLoader, setAngularLoader } from 'app/core/services/AngularLoader';
 import { configureStore } from 'app/store/configureStore';
 
 // Types