diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml
index ace548616..861a14c07 100644
--- a/roles/network/tasks/computed_network.yml
+++ b/roles/network/tasks/computed_network.yml
@@ -117,6 +117,11 @@
                                                    # This workaround can and should evolve as IIAB 6.5 matures!
   when: num_lan_interfaces == "1" and user_lan_iface == "auto" and user_wan_iface == "auto"
 
+- name: Use old gateway device info if not detected and using static ip
+  set_fact:
+    iiab_wan_iface: "{{ device_gw }}"
+  when: wan_ip != "dhcp" and iiab_wan_iface == "none"
+
 - name: No LAN configured - 'Appliance' mode
   set_fact:
     iiab_network_mode: "Appliance"