diff --git a/ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.cpp
index d73fc876e6..5fb9270229 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirWellSpheresPartMgr.cpp
@@ -64,9 +64,12 @@ void RivReservoirWellSpheresPartMgr::appendDynamicGeometryPartsToModel(cvf::Mode
 {
     if (!m_reservoirView->wellCollection()->showCellCenterSpheres) return;
 
+    if (m_reservoirView->wellCollection()->wellPipeVisibility() == RimEclipseWellCollection::PIPES_FORCE_ALL_OFF) return;
+
+    if (!m_reservoirView->wellCollection()->isActive()) return;
+
     if (m_reservoirView->wellCollection()->wells.size() != m_wellSpheresPartMgrs.size())
     {
-
         for (RimEclipseWell* rimWell : m_reservoirView->wellCollection()->wells())
         {
             RivWellSpheresPartMgr* wppmgr = new RivWellSpheresPartMgr(m_reservoirView, rimWell);
@@ -77,7 +80,10 @@ void RivReservoirWellSpheresPartMgr::appendDynamicGeometryPartsToModel(cvf::Mode
 
     for (size_t i = 0; i < m_wellSpheresPartMgrs.size(); i++)
     {
+        if (m_reservoirView->wellCollection()->wells[i]->showWell())
+        {
         m_wellSpheresPartMgrs.at(i)->appendDynamicGeometryPartsToModel(model, frameIndex);
+        }
     }
 }
 
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp b/ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
index 0a1f6ea9de..34ab6c1425 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
@@ -295,6 +295,8 @@ void RimEclipseWellCollection::defineUiOrdering(QString uiConfigName, caf::PdmUi
     wellPipe->add(&wellPipeVisibility);
     wellPipe->add(&pipeRadiusScaleFactor);
 
+    //TODO: Add Well sphere group
+
     caf::PdmUiGroup* advancedGroup = uiOrdering.addNewGroup("Advanced");
     advancedGroup->add(&wellCellTransparencyLevel);
     advancedGroup->add(&isAutoDetectingBranches);