diff --git a/src/components/Map/Map.js b/src/components/Map/Map.js
index e3fe7a4e..56730bb0 100644
--- a/src/components/Map/Map.js
+++ b/src/components/Map/Map.js
@@ -3,7 +3,8 @@ import { bool, number, object, string } from 'prop-types';
 import classNames from 'classnames';
 import { propTypes } from '../../util/types';
 import config from '../../config';
-import { StaticMap, DynamicMap, isMapsLibLoaded } from './GoogleMap';
+// import { StaticMap, DynamicMap, isMapsLibLoaded } from './GoogleMap';
+import { StaticMap, DynamicMap, isMapsLibLoaded } from './MapboxMap';
 
 import css from './Map.css';
 
diff --git a/src/components/Map/MapboxMap.js b/src/components/Map/MapboxMap.js
new file mode 100644
index 00000000..56716827
--- /dev/null
+++ b/src/components/Map/MapboxMap.js
@@ -0,0 +1,6 @@
+export { default as DynamicMap } from './DynamicMapboxMap';
+export { default as StaticMap } from './StaticMapboxMap';
+
+export const isMapsLibLoaded = () => {
+  return typeof window !== 'undefined' && window.mapboxgl;
+};