diff --git a/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/ConfigurationFactory.java b/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/ConfigurationFactory.java
index 54918963406..8d02ecf73fa 100644
--- a/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/ConfigurationFactory.java
+++ b/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/ConfigurationFactory.java
@@ -83,8 +83,8 @@ public IgniteConfiguration execute()
 
     private AddressResolver getAddressResolver()
     {
-        final String discoveryTcpLocalAddress = igniteSettings.network_host();
-        final String publishAddress = igniteSettings.network_publish_host();
+        final String discoveryTcpLocalAddress = clusterConfig.networkHost();
+        final String publishAddress = clusterConfig.networkPublishHost();
         if ( isEmpty( publishAddress ) || isEmpty( discoveryTcpLocalAddress ) )
         {
             return null;
diff --git a/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/IgniteSettings.java b/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/IgniteSettings.java
index 0ceecda8aa7..1c80d3c8099 100644
--- a/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/IgniteSettings.java
+++ b/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/IgniteSettings.java
@@ -33,8 +33,4 @@
     int communication_message_queue_limit() default 1024;
 
     String discovery_unicast_sockets();
-
-    String network_publish_host();
-
-    String network_host();
 }
diff --git a/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/StaticIpFinderFactory.java b/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/StaticIpFinderFactory.java
index 4160d551933..f6ad7c6703a 100644
--- a/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/StaticIpFinderFactory.java
+++ b/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/StaticIpFinderFactory.java
@@ -37,7 +37,7 @@ TcpDiscoveryVmIpFinder execute()
 
         final String portPrefix = getPortPrefix();
 
-        final String discoveryTcpLocalAddress = igniteConfig.network_host();
+        final String discoveryTcpLocalAddress = clusterConfig.networkHost();
         final Stream<String> configLocalAddress = Stream.of( discoveryTcpLocalAddress + portPrefix );
         final Stream<String> discoveryAddresses = getDiscoveryAddresses( portPrefix );
         final List<String> hostStrings = Stream.concat( discoveryAddresses, configLocalAddress ).
diff --git a/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/TcpDiscoveryFactory.java b/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/TcpDiscoveryFactory.java
index 4f71715ef45..9bc2015c83f 100644
--- a/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/TcpDiscoveryFactory.java
+++ b/modules/core/core-ignite/src/main/java/com/enonic/xp/ignite/impl/config/TcpDiscoveryFactory.java
@@ -29,7 +29,7 @@ TcpDiscoverySpi execute()
         discoverySpi.setIpFinder( createStaticIpConfig() ).
             setLocalPort( igniteConfig.discovery_tcp_port() ).
             setLocalPortRange( igniteConfig.discovery_tcp_port_range() ).
-            setLocalAddress( igniteConfig.network_host() ).
+            setLocalAddress( clusterConfig.networkHost() ).
             setReconnectCount( igniteConfig.discovery_tcp_reconnect() ).
             setAckTimeout( igniteConfig.discovery_tcp_ack_timeout() ).
             setJoinTimeout( igniteConfig.discovery_tcp_join_timeout() ).
diff --git a/modules/web/web-jetty/src/main/java/com/enonic/xp/web/jetty/impl/JettyActivator.java b/modules/web/web-jetty/src/main/java/com/enonic/xp/web/jetty/impl/JettyActivator.java
index aa64e645f5c..67e383a88f3 100644
--- a/modules/web/web-jetty/src/main/java/com/enonic/xp/web/jetty/impl/JettyActivator.java
+++ b/modules/web/web-jetty/src/main/java/com/enonic/xp/web/jetty/impl/JettyActivator.java
@@ -55,8 +55,12 @@ public void activate( final BundleContext context, final JettyConfig config )
         this.service = new JettyService();
         this.service.config = this.config;
         this.service.workerName = clusterConfig.name().toString();
-        //if ( clusterConfig.isSessionReplicationEnabled() )
+        if ( clusterConfig.isEnabled() && clusterConfig.isSessionReplicationEnabled() )
         {
+            if ( sessionDataStoreFactory == null )
+            {
+                throw new IllegalStateException( "Session replication enabled, but no Session datastore provided" );
+            }
             this.service.sessionDataStoreFactory = sessionDataStoreFactory;
         }