diff --git a/doc/manual/risk.rst b/doc/manual/risk.rst
index 42651be37dcb..6a628f57ca1d 100644
--- a/doc/manual/risk.rst
+++ b/doc/manual/risk.rst
@@ -449,9 +449,6 @@ OpenQuake- engine Book (Risk).
 Infrastructure Risk Analysis
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. warning::
-    Infrastructure Risk Analysis is still an experimental feature
-
 Rationale
 ~~~~~~~~~
 
diff --git a/openquake/calculators/event_based_damage.py b/openquake/calculators/event_based_damage.py
index 2b05dfa9066c..0f8784f7a3b7 100644
--- a/openquake/calculators/event_based_damage.py
+++ b/openquake/calculators/event_based_damage.py
@@ -289,11 +289,6 @@ def post_execute(self, dummy):
         if (hasattr(oq, 'infrastructure_connectivity_analysis')
                 and oq.infrastructure_connectivity_analysis):
 
-            # FIXME: Improve the warning message, both here and in the
-            #        documentation
-            logging.warning(
-                'Connectivity analysis is still an experimental feature!')
-
             conn_results = connectivity.analysis(self.datastore)
             self._store_connectivity_analysis_results(conn_results)