diff --git a/common/containers/Tabs/Swap/components/CurrencySwap.tsx b/common/containers/Tabs/Swap/components/CurrencySwap.tsx
index fdad9a75..0c116756 100644
--- a/common/containers/Tabs/Swap/components/CurrencySwap.tsx
+++ b/common/containers/Tabs/Swap/components/CurrencySwap.tsx
@@ -110,31 +110,11 @@ export default class CurrencySwap extends PureComponent<Props, State> {
 
   public componentDidUpdate(prevProps: Props, prevState: State) {
     const { origin, destination } = this.state;
-    const { options, bityRates, shapeshiftRates } = this.props;
+    const { options } = this.props;
     if (origin !== prevState.origin) {
       this.setDisabled(origin, destination);
     }
 
-    const originCap = origin.id.toUpperCase();
-    const destCap = destination.id.toUpperCase();
-    const { provider } = this.props;
-
-    const ensureCorrectProvider =
-      (originCap === 'BTC' && destCap === 'ETH') || (destCap === 'BTC' && originCap === 'ETH');
-    const ensureBityRatesLoaded =
-      bityRates.allIds.includes('ETHBTC') && bityRates.allIds.includes('BTCETH');
-    const ensureShapeshiftRatesLoaded = shapeshiftRates.allIds.length > 0;
-
-    if (ensureBityRatesLoaded && ensureCorrectProvider) {
-      if (provider === 'shapeshift') {
-        this.props.swapProvider('bity');
-      }
-    } else if (ensureShapeshiftRatesLoaded) {
-      if (provider !== 'shapeshift') {
-        this.props.swapProvider('shapeshift');
-      }
-    }
-
     if (options.allIds !== prevProps.options.allIds && options.byId) {
       const originKindOptions: any[] = Object.values(options.byId);
       const destinationKindOptions: any[] = Object.values(
diff --git a/common/containers/Tabs/Swap/index.tsx b/common/containers/Tabs/Swap/index.tsx
index af51b987..564b7f6d 100644
--- a/common/containers/Tabs/Swap/index.tsx
+++ b/common/containers/Tabs/Swap/index.tsx
@@ -113,12 +113,10 @@ class Swap extends Component<ReduxActionProps & ReduxStateProps & RouteComponent
   }
 
   public componentWillUnmount() {
-    this.props.stopLoadBityRatesSwap();
     this.props.stopLoadShapeshiftRatesSwap();
   }
 
   public loadRates() {
-    this.props.loadBityRatesRequestedSwap();
     this.props.loadShapeshiftRatesRequestedSwap();
   }
 
diff --git a/common/reducers/swap/index.ts b/common/reducers/swap/index.ts
index 2ea56dc3..bdadd707 100644
--- a/common/reducers/swap/index.ts
+++ b/common/reducers/swap/index.ts
@@ -45,7 +45,7 @@ export const INITIAL_STATE: State = {
     byId: {},
     allIds: []
   },
-  provider: 'bity',
+  provider: 'shapeshift',
   destinationAddress: '',
   bityOrder: {},
   shapeshiftOrder: {},
diff --git a/spec/pages/__snapshots__/Swap.spec.tsx.snap b/spec/pages/__snapshots__/Swap.spec.tsx.snap
index 6589d271..ff8bb522 100644
--- a/spec/pages/__snapshots__/Swap.spec.tsx.snap
+++ b/spec/pages/__snapshots__/Swap.spec.tsx.snap
@@ -78,7 +78,7 @@ exports[`render snapshot 1`] = `
   }
   outputTx={null}
   paymentAddress={null}
-  provider="bity"
+  provider="shapeshift"
   restartSwap={[Function]}
   secondsRemaining={null}
   shapeshiftOrder={Object {}}