diff --git a/modules/rhizo_base/templates/osmo-hlr.cfg.erb b/modules/rhizo_base/templates/osmo-hlr.cfg.erb
index 1f91a32..70b36c4 100644
--- a/modules/rhizo_base/templates/osmo-hlr.cfg.erb
+++ b/modules/rhizo_base/templates/osmo-hlr.cfg.erb
@@ -57,15 +57,13 @@ hlr
  ussd route prefix *#100# internal own-msisdn
  ussd route prefix *#101# internal own-imsi
 mslookup
+ ignore-created-on-demand
  server
   mdns bind 239.192.23.42 4266
   service sip.voice at <%= @vpn_ip_address %> 5060
   service smpp.sms at <%= @vpn_ip_address %> 2775
  client
   mdns bind 239.192.23.42 4266
-!
-! Can't have create on demand and client at
-! same time, so we turn off client here.
-!!
- no client
+  timeout 1500
+  create-on-demand-fallback
 end