diff --git a/src/common/index.js b/src/common/index.js
index 3def79626..82e46f1e1 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -36,6 +36,7 @@ const useInLibrary = require('./useInLibrary');
 const useLiveRef = require('./useLiveRef');
 const useModelState = require('./useModelState');
 const useProfile = require('./useProfile');
+const useStreamingServer = require('./useStreamingServer');
 
 module.exports = {
     AddonDetailsModal,
@@ -76,4 +77,5 @@ module.exports = {
     useLiveRef,
     useModelState,
     useProfile,
+    useStreamingServer,
 };
diff --git a/src/routes/Settings/useStreamingServer.js b/src/common/useStreamingServer.js
similarity index 93%
rename from src/routes/Settings/useStreamingServer.js
rename to src/common/useStreamingServer.js
index af1f7526a..20268e639 100644
--- a/src/routes/Settings/useStreamingServer.js
+++ b/src/common/useStreamingServer.js
@@ -2,7 +2,7 @@
 
 const React = require('react');
 const { useServices } = require('stremio/services');
-const { useModelState } = require('stremio/common');
+const useModelState = require('stremio/common/useModelState');
 
 const useStreamingServer = () => {
     const { core } = useServices();
diff --git a/src/routes/Settings/Settings.js b/src/routes/Settings/Settings.js
index 07662b59f..32ea222b8 100644
--- a/src/routes/Settings/Settings.js
+++ b/src/routes/Settings/Settings.js
@@ -6,8 +6,7 @@ const throttle = require('lodash.throttle');
 const Icon = require('stremio-icons/dom');
 const { useRouteFocused } = require('stremio-router');
 const { useServices } = require('stremio/services');
-const { Button, Checkbox, MainNavBars, Multiselect, ColorInput, useProfile } = require('stremio/common');
-const useStreamingServer = require('./useStreamingServer');
+const { Button, Checkbox, MainNavBars, Multiselect, ColorInput, useProfile, useStreamingServer } = require('stremio/common');
 const useProfileSettingsInputs = require('./useProfileSettingsInputs');
 const useStreamingServerSettingsInputs = require('./useStreamingServerSettingsInputs');
 const styles = require('./styles');