diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index 5e95182d3..e4ec63bd8 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -269,8 +269,8 @@
   register: FW_rejected_country
   ignore_errors: True
 
-- name: Detect country code passed from cmdline
-  shell: dmesg | awk -F cfg80211.ieee80211_regdom= '{print $2}'
+- name: Detect country code passed from cmdline in dmesg
+  shell: dmesg | grep ieee80211 | awk -F cfg80211.ieee80211_regdom= '{print $2}'
   register: cmdline_country_code
   ignore_errors: True
 
@@ -356,7 +356,7 @@
     value: "{{ item.value | string }}"
   with_items:
     - option: FW_rejected_country
-      value: "{{ cmdline_country_code }}"
+      value: "{{ cmdline_country_code.stdout }}"
   when: FW_rejected_country.stdout is defined
 
 # well if there ever was a point to tell the user things are FUBAR this is it.