diff --git a/geonode/maps/urls.py b/geonode/maps/urls.py
index 92987cc31f6..18bb385c4de 100644
--- a/geonode/maps/urls.py
+++ b/geonode/maps/urls.py
@@ -20,6 +20,12 @@
 
 from django.conf.urls import url, include
 from django.views.generic import TemplateView
+<<<<<<< HEAD
+=======
+
+from geonode import geoserver
+from geonode.utils import check_ogc_backend
+>>>>>>> [Fixes #6918] Removal of QGIS support (#6919)
 from geonode.monitoring import register_url_event
 
 from . import views
@@ -30,10 +36,22 @@
 
 new_map_view = views.new_map
 existing_map_view = views.map_view
+<<<<<<< HEAD
 map_embed = views.map_embed
 map_edit = views.map_edit
 map_json = views.map_json
 map_thumbnail = views.map_thumbnail
+=======
+
+if check_ogc_backend(geoserver.BACKEND_PACKAGE):
+    new_map_view = views.new_map
+    existing_map_view = views.map_view
+    map_embed = views.map_embed
+    map_edit = views.map_edit
+    map_json = views.map_json
+    map_thumbnail = views.map_thumbnail
+
+>>>>>>> [Fixes #6918] Removal of QGIS support (#6919)
 maps_list = register_url_event()(TemplateView.as_view(template_name='maps/map_list.html'))
 
 urlpatterns = [