diff --git a/config/wireless b/config/wireless
index 3b98a78..c7a9602 100644
--- a/config/wireless
+++ b/config/wireless
@@ -75,16 +75,18 @@ config wifi-iface 'wifi{{ loop.index }}_radio0'
 	option key '{{ wireless_network.passphrase }}'
 	option encryption '{{ wireless_network.encryption | default('psk2') }}'
 	option ssid '{{ wireless_network.SSID }}'
+	option time_zone 'Europe/Amsterdam'
+{% if wireless_network.roaming | default(true) %}
 	option ft_over_ds '1'
 	option ft_psk_generate_local '1'
 	option ieee80211r '1'
 	option bss_transition '1'
 	option wnm_sleep_mode '1'
 	option time_advertisement '2'
-	option time_zone 'Europe/Amsterdam'
 	option ieee80211k '1'
 	option rrm_neighbor_report '1'
 	option rrm_beacon_report '1'
+{% endif %}
 	option macfilter 'deny'
 {% if wireless_network.client_isolation is defined and wireless_network.client_isolation %}
 	option isolate '1'
@@ -102,16 +104,18 @@ config wifi-iface 'wifi{{ loop.index }}_radio1'
 	option key '{{ wireless_network.passphrase }}'
 	option encryption '{{ wireless_network.encryption | default('psk2') }}'
 	option ssid '{{ wireless_network.SSID }}'
+	option time_zone 'Europe/Amsterdam'
+{% if wireless_network.roaming | default(true) %}
 	option ft_over_ds '1'
 	option ft_psk_generate_local '1'
 	option ieee80211r '1'
 	option bss_transition '1'
 	option wnm_sleep_mode '1'
 	option time_advertisement '2'
-	option time_zone 'Europe/Amsterdam'
 	option ieee80211k '1'
 	option rrm_neighbor_report '1'
 	option rrm_beacon_report '1'
+{% endif %}
 	option macfilter 'deny'
 {% if wireless_network.client_isolation is defined and wireless_network.client_isolation %}
 	option isolate '1'
diff --git a/inventory-sample.yaml b/inventory-sample.yaml
index e0bc904..a358814 100644
--- a/inventory-sample.yaml
+++ b/inventory-sample.yaml
@@ -126,6 +126,8 @@ openwrt:
         client_isolation: true
         # Optionally set encryption, defaults to psk2 (WPA2)
         encryption: psk2
+        # Optionally disable advanced roaming featured (802.11r/k/v) (default is true to enable)
+        roaming: false
     # Physical address of the wireless radios. Move lower if using different model, with different settings
     # per model
     radio2_path: platform/ahb/18100000.wmac