diff --git a/src/components/Map/index.tsx b/src/components/Map/index.tsx
index fc13b669..bcf905c9 100644
--- a/src/components/Map/index.tsx
+++ b/src/components/Map/index.tsx
@@ -28,7 +28,6 @@ import { useOnMapFeatureMove } from '@lib/hooks/useOnMapFeatureMove'
 import { useMapUserGeolocationMarker } from '@lib/hooks/useMapUserGeolocationMarker'
 import { useInitialViewport } from '@lib/hooks/useInitialViewport'
 import { useMapHighlightMarker } from '@lib/hooks/useMapHighlightMarker'
-import { useMapSearchMarker } from '@lib/hooks/useMapSearchMarker'
 import { useMaplibreMap } from '@lib/hooks/useMaplibreMap'
 import { useFiltersWithActiveProp } from '@lib/hooks/useFiltersWithActiveProp'
 import {
@@ -47,7 +46,6 @@ interface MapType {
    * Also, a highlighted marker will be drawn to the map.
    */
   highlightedCenter?: [longitude: number, latitude: number]
-  searchCenter?: [longitude: number, latitude: number]
 }
 
 const easeInOutQuad = (t: number): number =>
@@ -74,7 +72,6 @@ export const FacilitiesMap: FC<MapType> = ({
   onClickAnywhere = () => undefined,
   onMoveStart = () => undefined,
   highlightedCenter,
-  searchCenter,
 }) => {
   const { query, push } = useRouter()
   const texts = useTexts()
@@ -96,15 +93,6 @@ export const FacilitiesMap: FC<MapType> = ({
 
   const [urlState, setUrlState] = useUrlState()
 
-  const highlightedSearchViewport = searchCenter
-    ? {
-        latitude: searchCenter[1],
-        longitude: searchCenter[0],
-        zoom: MAP_CONFIG.zoomedInZoom,
-      }
-    : null
-  useMapSearchMarker(map, highlightedSearchViewport)
-
   const id = typeof query.id === 'string' ? parseInt(query.id, 10) : undefined
   const currentFacilityIdPageIsSpiderfied =
     id && isSpiderfied && spiderifier.current?.expandedIds.includes(id)
diff --git a/src/components/MapHeader.tsx b/src/components/MapHeader.tsx
index 17ce97e1..8b6ef461 100644
--- a/src/components/MapHeader.tsx
+++ b/src/components/MapHeader.tsx
@@ -1,23 +1,19 @@
 import classNames from '@lib/classNames'
-import { FeatureType } from '@lib/requests/geocode'
 import { useTexts } from '@lib/TextsContext'
 import { useUrlState } from '@lib/UrlStateContext'
 import { FC } from 'react'
 import { IconButtonLink } from './IconButton'
 import { House } from './icons/House'
-import { Search } from './Search'
 
 interface MapHeaderPropsType {
   filterSidebarIsOpened: boolean
   listViewOpen: boolean
   setFilterSidebarIsOpened: (newState: boolean) => void
-  handleSearchResult: ((place: FeatureType) => void) | undefined
 }
 
 export const MapHeader: FC<MapHeaderPropsType> = ({
   filterSidebarIsOpened,
   setFilterSidebarIsOpened,
-  handleSearchResult,
   listViewOpen,
 }) => {
   const [urlState] = useUrlState()
@@ -47,7 +43,6 @@ export const MapHeader: FC<MapHeaderPropsType> = ({
       <div
         className={classNames(
           `flex fixed top-4 right-4 transition-transform z-30 md:gap-5`,
-          `w-full max-w-[calc(100vw-2rem)] md:max-w-xs lg:max-w-sm justify-between`,
           filterSidebarIsOpened
             ? `2xl:-translate-x-sidebarW`
             : `2xl:translate-x-0`
@@ -64,14 +59,6 @@ export const MapHeader: FC<MapHeaderPropsType> = ({
         >
           <House />
         </IconButtonLink>
-        <div
-          className={classNames(
-            'w-full',
-            listViewOpen && 'opacity-0 lg:opacity-100'
-          )}
-        >
-          <Search onSelectResult={handleSearchResult} />
-        </div>
 
         <button
           onClick={() => setFilterSidebarIsOpened(!filterSidebarIsOpened)}
diff --git a/src/components/MapLayout.tsx b/src/components/MapLayout.tsx
index 5375b54a..45250c5d 100644
--- a/src/components/MapLayout.tsx
+++ b/src/components/MapLayout.tsx
@@ -1,4 +1,3 @@
-import { FeatureType } from '@lib/requests/geocode'
 import { FC, useEffect, useState } from 'react'
 import { FacilitiesMap } from './Map'
 import classNames from '@lib/classNames'
@@ -30,14 +29,11 @@ export const MapLayout: FC<{
   const [mapCenter, setMapCenter] = useState<
     [lng: number, lat: number] | undefined
   >()
-  const [searchCenter, setSearchCenter] = useState<
-    [lng: number, lat: number] | undefined
-  >()
   const [selectedFacilities, setSelectedFacilities] = useState<
     MinimalRecordType[]
   >([])
   const [filterSidebarIsOpened, setFilterSidebarIsOpened] = useState(false)
-  const [urlState, setUrlState] = useUrlState()
+  const [urlState] = useUrlState()
   const [hasScrolled, setHasScrolled] = useState<boolean>(false)
   const isMobile = useIsMobile()
 
@@ -64,14 +60,6 @@ export const MapLayout: FC<{
     if (!records) return
   }
 
-  const handleSearchResult = (place: FeatureType): void => {
-    setSearchCenter(place.center)
-    setUrlState({
-      longitude: place.center[0],
-      latitude: place.center[1],
-    })
-  }
-
   useEffect(() => {
     setSelectedFacilities([])
     if (!query.id || typeof query.id !== 'string') {
@@ -105,7 +93,6 @@ export const MapLayout: FC<{
                 setSelectedFacilities([])
               }}
               highlightedCenter={mapCenter}
-              searchCenter={searchCenter}
             />
             {[selectedFacilities[0]].filter(Boolean).map(({ id }) => (
               <div
@@ -166,7 +153,6 @@ export const MapLayout: FC<{
         </aside>
         {!isFallback && showMapUi && (
           <MapHeader
-            handleSearchResult={handleSearchResult}
             filterSidebarIsOpened={filterSidebarIsOpened}
             setFilterSidebarIsOpened={setFilterSidebarIsOpened}
             listViewOpen={listViewOpen}
diff --git a/src/components/Search/Search.test.tsx b/src/components/Search/Search.test.tsx
deleted file mode 100644
index 710db87d..00000000
--- a/src/components/Search/Search.test.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import '@testing-library/jest-dom'
-import { Search } from './'
-import { MOCK_GEOCODING_RESULTS } from 'src/mocks/geocodeResults'
-import { geocode } from '@lib/requests/geocode'
-
-jest.mock('@lib/requests/geocode')
-
-describe('Search', () => {
-  it('displays no results with 3 or less input characters', async () => {
-    const user = userEvent.setup()
-
-    render(<Search />)
-
-    const input = screen.getByLabelText('Standortsuche')
-    expect(input).toBeInTheDocument()
-
-    await user.type(input, 'pla')
-
-    expect(input).toHaveValue('pla')
-
-    const resultsList = screen.getByLabelText('Ergebnisse der Standortsuche')
-    expect(resultsList).toBeEmptyDOMElement()
-  })
-
-  it('displays no results with gibberish input', async () => {
-    const user = userEvent.setup()
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    geocode.mockResolvedValueOnce({
-      features: [],
-    })
-
-    render(<Search />)
-
-    const input = screen.getByLabelText('Standortsuche')
-    expect(input).toBeInTheDocument()
-
-    await user.type(input, 'ehiurfkergfhifgkd')
-
-    const resultsList = screen.getByLabelText('Ergebnisse der Standortsuche')
-    expect(resultsList).toBeEmptyDOMElement()
-  })
-
-  it('displays results after input', async () => {
-    const user = userEvent.setup()
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    geocode.mockResolvedValueOnce(MOCK_GEOCODING_RESULTS)
-
-    render(<Search />)
-
-    const input = screen.getByLabelText('Standortsuche')
-    expect(input).toBeInTheDocument()
-
-    await user.type(input, 'plat')
-
-    expect(input).toHaveValue('plat')
-
-    MOCK_GEOCODING_RESULTS.features.forEach((feature) => {
-      const placeButton = screen.getByRole('button', {
-        name: feature.place_name,
-      })
-      expect(placeButton).toBeInTheDocument()
-    })
-  })
-
-  it('lets susers click a result', async () => {
-    const user = userEvent.setup()
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    geocode.mockResolvedValueOnce(MOCK_GEOCODING_RESULTS)
-
-    render(<Search />)
-
-    const input = screen.getByLabelText('Standortsuche')
-    expect(input).toBeInTheDocument()
-
-    await user.type(input, 'plat')
-
-    expect(input).toHaveValue('plat')
-
-    const placeNameToClick = MOCK_GEOCODING_RESULTS.features[0]
-    const placeButton = screen.getByRole('button', {
-      name: placeNameToClick.place_name,
-    })
-    expect(placeButton).toBeInTheDocument()
-
-    await user.click(placeButton)
-  })
-})
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
deleted file mode 100644
index deb475a3..00000000
--- a/src/components/Search/index.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { ChangeEvent, FC, useState } from 'react'
-import { FeatureType, geocode } from '@lib/requests/geocode'
-import classNames from '@lib/classNames'
-import useClickOutside from '@lib/useClickOutside'
-
-interface SearchType {
-  onSelectResult?: (place: FeatureType) => void
-}
-export const Search: FC<SearchType> = ({
-  onSelectResult = () => undefined,
-}) => {
-  const [searchInput, setSearchInput] = useState('')
-  const [searchResults, setSearchResults] = useState<FeatureType[]>([])
-  const containerRef = useClickOutside<HTMLDivElement>(() => {
-    setSearchInput('')
-    setSearchResults([])
-  })
-  const onSearchInput = async (
-    e: ChangeEvent<HTMLInputElement>
-  ): Promise<void> => {
-    const inputValue = e.target.value
-    setSearchInput(inputValue)
-
-    if (inputValue.length <= 3) return
-    const results = await geocode(inputValue)
-    if (!results) return
-    setSearchResults(results.features)
-  }
-  return (
-    <div
-      className={classNames(
-        `max-w-72 w-full bg-white h-12 md:rounded focus:rounded`,
-        `shadow-md shadow-black/5`
-      )}
-      ref={containerRef}
-    >
-      <div className="grid grid-cols-1 h-12">
-        <label htmlFor="geocoding-input" className="sr-only">
-          Standortsuche
-        </label>
-        <input
-          type="text"
-          name="place"
-          id="geocoding-input"
-          className={classNames(
-            `border border-gray-20 md:rounded px-3 py-2 h-12`,
-            `focus:outline-none focus:ring-2 focus:ring-primary focus:rounded`,
-            `focus:ring-offset-2 focus:ring-offset-white focus:border-primary`,
-            `relative focus:z-10 shadow-none placeholder:text-gray-60`
-          )}
-          placeholder="Adresssuche"
-          value={searchInput}
-          // eslint-disable-next-line @typescript-eslint/no-misused-promises
-          onChange={onSearchInput}
-        />
-      </div>
-      <ul
-        className="border-x border-gray-20"
-        aria-label="Ergebnisse der Standortsuche"
-      >
-        {searchResults.length > 0 &&
-          searchResults.map((searchResult) => {
-            return (
-              <li
-                key={`${searchResult.id} ${searchResult.place_name}`}
-                className="border-b border-gray-10 last-of-type:border-gray-20 bg-white"
-              >
-                <button
-                  className="text-left w-full py-2 px-3 transition-colors hover:bg-gray-50"
-                  onClick={() => {
-                    setSearchInput('')
-                    setSearchResults([])
-                    onSelectResult(searchResult)
-                  }}
-                >
-                  {searchResult.place_name}
-                </button>
-              </li>
-            )
-          })}
-      </ul>
-    </div>
-  )
-}
diff --git a/src/lib/hooks/useMapSearchMarker.ts b/src/lib/hooks/useMapSearchMarker.ts
deleted file mode 100644
index 4b3bce2f..00000000
--- a/src/lib/hooks/useMapSearchMarker.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import classNames from '@lib/classNames'
-import { ViewportType } from '@lib/types/map'
-import { LngLatLike, Map, Marker } from 'maplibre-gl'
-import { useEffect, useRef } from 'react'
-
-export function useMapSearchMarker(
-  map: Map | null,
-  searchViewport: ViewportType | null
-): void {
-  const highlightedSearchMarker = useRef<Marker>(null)
-  useEffect(() => {
-    if (!map) return
-    if (!searchViewport?.latitude) {
-      // Without a searchCenter we want to remove any highlightedSearchMarker:
-      highlightedSearchMarker && highlightedSearchMarker.current?.remove()
-      return
-    } else {
-      // Remove possibly existent markers:
-      highlightedSearchMarker.current?.remove()
-
-      const customMarker = document.createElement('div')
-      customMarker.className = classNames('w-8 h-8 bg-norepeat')
-      customMarker.style.backgroundImage = 'url("/images/search_geopin.svg")'
-
-      const searchCenter = [
-        searchViewport.longitude,
-        searchViewport.latitude,
-      ] as LngLatLike
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      highlightedSearchMarker.current = new Marker(customMarker)
-        .setLngLat(searchCenter)
-        .addTo(map)
-
-      map.easeTo({
-        center: searchCenter,
-        zoom: searchViewport.zoom,
-      })
-    }
-  }, [
-    map,
-    searchViewport?.latitude,
-    searchViewport?.longitude,
-    searchViewport?.zoom,
-  ])
-}
diff --git a/src/lib/hooks/useMaplibreMap.ts b/src/lib/hooks/useMaplibreMap.ts
index 9f3386b4..bfefa383 100644
--- a/src/lib/hooks/useMaplibreMap.ts
+++ b/src/lib/hooks/useMaplibreMap.ts
@@ -10,8 +10,10 @@ export function useMaplibreMap(config: {
   minZoom: number
 }): Map | null {
   const map = useRef<Map>(null)
+  const mapIsInitialized = useRef<boolean>(false)
   // Map setup (run only once on initial render)
   useEffect(() => {
+    if (mapIsInitialized.current) return
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     map.current = new Map({
@@ -24,6 +26,7 @@ export function useMaplibreMap(config: {
       minZoom: config.minZoom,
       maxZoom: config.maxZoom,
     })
+    mapIsInitialized.current = true
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])