diff --git a/lib/ui/package.json b/lib/ui/package.json
index 35663cc17196..584e41e7c980 100644
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@@ -28,7 +28,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.pick": "^4.4.0",
     "lodash.sortby": "^4.7.0",
-    "podda": "^1.2.2",
+    "@storybook/podda": "^1.2.3",
     "prop-types": "^15.6.0",
     "qs": "^6.5.1",
     "react-fuzzy": "^0.5.2",
diff --git a/lib/ui/src/index.js b/lib/ui/src/index.js
index 1ed59a680ab3..10c6816bef39 100644
--- a/lib/ui/src/index.js
+++ b/lib/ui/src/index.js
@@ -1,5 +1,5 @@
 import { createApp } from '@storybook/mantra-core';
-import Podda from 'podda';
+import Podda from '@storybook/podda';
 
 import buildContext from './context';
 import shortcutsModule from './modules/shortcuts';
diff --git a/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js b/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js
index c715c69265a2..4a2645a90c8b 100644
--- a/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js
+++ b/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js
@@ -1,4 +1,4 @@
-import Podda from 'podda';
+import Podda from '@storybook/podda';
 import genPoddaLoader from './gen_podda_loader';
 
 describe('manager.ui.libs.gen_podda_loader', () => {
diff --git a/yarn.lock b/yarn.lock
index b74442e87233..d2c9ed0d5a9c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -276,6 +276,13 @@
     "@storybook/react-simple-di" "^1.2.1"
     babel-runtime "6.x.x"
 
+"@storybook/podda@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/podda/-/podda-1.2.3.tgz#53c4a1a3f8c7bbd5755dff5c34576fd1af9d38ba"
+  dependencies:
+    babel-runtime "^6.11.6"
+    immutable "^3.8.1"
+
 "@storybook/react-komposer@^2.0.1", "@storybook/react-komposer@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.3.tgz#f9e12a9586b2ce95c24c137eabb8b71527ddb369"
@@ -11670,13 +11677,6 @@ pngjs@^3.0.0, pngjs@^3.3.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.1.tgz#8e14e6679ee7424b544334c3b2d21cea6d8c209a"
 
-podda@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/podda/-/podda-1.2.2.tgz#15b0edbd334ade145813343f5ecf9c10a71cf500"
-  dependencies:
-    babel-runtime "^6.11.6"
-    immutable "^3.8.1"
-
 polymer-webpack-loader@2.0.1, polymer-webpack-loader@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/polymer-webpack-loader/-/polymer-webpack-loader-2.0.1.tgz#d15d45328f6a6700366dfaee83fc606f39cdcee0"