diff --git a/packages/grafana-runtime/src/unstable/ScopesContext.ts b/packages/grafana-runtime/src/services/ScopesContext.ts
similarity index 100%
rename from packages/grafana-runtime/src/unstable/ScopesContext.ts
rename to packages/grafana-runtime/src/services/ScopesContext.ts
diff --git a/packages/grafana-runtime/src/services/index.ts b/packages/grafana-runtime/src/services/index.ts
index 496246bd6c4..3ceef02923a 100644
--- a/packages/grafana-runtime/src/services/index.ts
+++ b/packages/grafana-runtime/src/services/index.ts
@@ -56,3 +56,4 @@ export {
 export { isPluginExtensionLink, isPluginExtensionComponent } from './pluginExtensions/utils';
 export { setCurrentUser } from './user';
 export { RuntimeDataSource } from './RuntimeDataSource';
+export { ScopesContext, type ScopesContextValueState, type ScopesContextValue, useScopes } from './ScopesContext';
diff --git a/packages/grafana-runtime/src/unstable.ts b/packages/grafana-runtime/src/unstable.ts
index 472372a9a8e..5cf9253a7c4 100644
--- a/packages/grafana-runtime/src/unstable.ts
+++ b/packages/grafana-runtime/src/unstable.ts
@@ -9,9 +9,5 @@
  * and be subject to the standard policies
  */
 
-export {
-  ScopesContext,
-  type ScopesContextValueState,
-  type ScopesContextValue,
-  useScopes,
-} from './unstable/ScopesContext';
+// Dummy export to make it a valid module. Remove when we have real exports.
+export const unstable = {};