diff --git a/libraries/AP_Networking/AP_Networking.cpp b/libraries/AP_Networking/AP_Networking.cpp
index 58bfa0d2c1..df8c66387c 100644
--- a/libraries/AP_Networking/AP_Networking.cpp
+++ b/libraries/AP_Networking/AP_Networking.cpp
@@ -470,10 +470,17 @@ const char *AP_Networking::address_to_str(uint32_t addr)
 }
 
 #ifdef LWIP_PLATFORM_ASSERT
+#if CONFIG_HAL_BOARD == HAL_BOARD_SITL || defined(HAL_DEBUG_BUILD)
 void ap_networking_platform_assert(const char *msg, int line)
 {
-    AP_HAL::panic("LWIP: %s: %u", msg, line);
+    AP_HAL::panic("LWIP:%u %s", line, msg);
 }
+#else
+void ap_networking_platform_assert(int line)
+{
+    AP_HAL::panic("LWIP:%u", line);
+}
+#endif
 #endif
 
 #ifdef LWIP_HOOK_IP4_ROUTE
diff --git a/libraries/AP_Networking/config/lwipopts.h b/libraries/AP_Networking/config/lwipopts.h
index 028d24f3b7..06f3532500 100644
--- a/libraries/AP_Networking/config/lwipopts.h
+++ b/libraries/AP_Networking/config/lwipopts.h
@@ -400,8 +400,13 @@ void sys_check_core_locking(void);
 
 #ifndef LWIP_PLATFORM_ASSERT
 /* Define LWIP_PLATFORM_ASSERT to something to catch missing stdio.h includes */
+#if CONFIG_HAL_BOARD == HAL_BOARD_SITL || defined(HAL_DEBUG_BUILD)
 void ap_networking_platform_assert(const char *msg, int line);
 #define LWIP_PLATFORM_ASSERT(x) ap_networking_platform_assert(x, __LINE__)
+#else
+void ap_networking_platform_assert(int line);
+#define LWIP_PLATFORM_ASSERT(x) ap_networking_platform_assert(__LINE__)
+#endif
 #endif
 
 /*