diff --git a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
index e4ddeee4e4..4dca84741f 100644
--- a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
+++ b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_multi_svm.py
@@ -2362,7 +2362,8 @@ class NetAppCmodeMultiSVMFileStorageLibrary(
 
         updated_export_locations = {}
         for share in shares:
-            if share['replica_state'] == constants.REPLICA_STATE_ACTIVE:
+            if share["replica_state"] in (None,
+                                          constants.REPLICA_STATE_ACTIVE):
                 host = share['host']
                 export_locations = self._create_export(
                     share, share_server, vserver_name, vserver_client,
diff --git a/releasenotes/notes/bug-2017501-fix-share-export-location-update.yaml b/releasenotes/notes/bug-2017501-fix-share-export-location-update.yaml
new file mode 100644
index 0000000000..643d4b1847
--- /dev/null
+++ b/releasenotes/notes/bug-2017501-fix-share-export-location-update.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixed share export location update when subnet is added to a network
+    containing shares. Please refer to the
+    `Launchpad bug #2017501 <https://bugs.launchpad.net/manila/+bug/2017501>`_
+    for more details.