diff --git a/src/components/panels/UserPanel.tsx b/src/components/panels/UserPanel.tsx
index 8d6765f..008c075 100644
--- a/src/components/panels/UserPanel.tsx
+++ b/src/components/panels/UserPanel.tsx
@@ -129,7 +129,13 @@ export class UserPanelUnconnected extends PureComponent<Props, State> {
     return (
       <div>
         <TitleDialog />
-        <NominatimSearchPanel active={features.nominatim} onSearch={this.props.editorSearchNominatim} />
+
+        {features.nominatim && (
+          <NominatimSearchPanel
+            active={features.nominatim}
+            onSearch={this.props.editorSearchNominatim}
+          />
+        )}
 
         <div className="panel active panel-user">
           <div className="user-panel">
diff --git a/src/redux/editor/sagas.ts b/src/redux/editor/sagas.ts
index f613dc1..b900dc3 100644
--- a/src/redux/editor/sagas.ts
+++ b/src/redux/editor/sagas.ts
@@ -97,7 +97,10 @@ export function* setReadySaga() {
   hideLoader();
 
   yield call(checkOSRMServiceSaga);
-  yield call(checkNominatimSaga);
+  
+  // TODO: someday make nominatim, but sorted by nearest points.
+  // yield call(checkNominatimSaga); 
+  
   yield put(searchSetTab(TABS.MY));
 }