diff --git a/CHANGELOG.md b/CHANGELOG.md
index 863f4e07c2..8439345988 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
   [#1358](https://github.com/bugsnag/bugsnag-android/pull/1358)
   [#1361](https://github.com/bugsnag/bugsnag-android/pull/1361)
   [#1363](https://github.com/bugsnag/bugsnag-android/pull/1363)
+  [#1379](https://github.com/bugsnag/bugsnag-android/pull/1379)
 
 * Update project to build using Gradle/AGP 7
   [#1354](https://github.com/bugsnag/bugsnag-android/pull/1354)
diff --git a/bugsnag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt b/bugsnag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt
index 623424d5cb..a4aaf72f7e 100644
--- a/bugsnag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt
+++ b/bugsnag-plugin-android-okhttp/src/main/java/com/bugsnag/android/okhttp/BugsnagOkHttpPlugin.kt
@@ -89,10 +89,14 @@ class BugsnagOkHttpPlugin @JvmOverloads constructor(
             "method" to request.method,
             "url" to sanitizeUrl(request),
             "duration" to nowMs - info.startTime,
-            "urlParams" to buildQueryParams(request),
             "requestContentLength" to info.requestBodyCount
         )
 
+        val queryParams = buildQueryParams(request)
+        if (queryParams.isNotEmpty()) {
+            data["urlParams"] = queryParams
+        }
+
         // only add response body length + status for requests that did not error
         if (result != RequestResult.ERROR) {
             data["responseContentLength"] = info.responseBodyCount
diff --git a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/CachedRequestIntegrationTest.kt b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/CachedRequestIntegrationTest.kt
index 2b1a81d317..d9212303ea 100644
--- a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/CachedRequestIntegrationTest.kt
+++ b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/CachedRequestIntegrationTest.kt
@@ -99,7 +99,7 @@ class CachedRequestIntegrationTest {
             assertEquals(0L, get("requestContentLength"))
             assertEquals(13L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url.toString(), get("url"))
         }
     }
@@ -129,7 +129,7 @@ class CachedRequestIntegrationTest {
             assertEquals(0L, get("requestContentLength"))
             assertEquals(13L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url.toString(), get("url"))
         }
     }
diff --git a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/ComplexRequestIntegrationTest.kt b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/ComplexRequestIntegrationTest.kt
index 8308925eeb..c776eb69d0 100644
--- a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/ComplexRequestIntegrationTest.kt
+++ b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/ComplexRequestIntegrationTest.kt
@@ -63,7 +63,7 @@ class ComplexRequestIntegrationTest {
             assertEquals("GET", get("method"))
             assertEquals(0L, get("requestContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
             assertNull(get("status"))
             assertNull(get("responseContentLength"))
@@ -89,7 +89,7 @@ class ComplexRequestIntegrationTest {
             assertEquals("GET", get("method"))
             assertEquals(0L, get("requestContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
             assertNull(get("status"))
             assertNull(get("responseContentLength"))
@@ -132,7 +132,7 @@ class ComplexRequestIntegrationTest {
             assertEquals("GET", get("method"))
             assertEquals(0L, get("requestContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url.toString(), get("url"))
             assertNull(get("status"))
             assertNull(get("responseContentLength"))
@@ -172,7 +172,7 @@ class ComplexRequestIntegrationTest {
             assertEquals(0L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url.toString(), get("url"))
         }
     }
diff --git a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/GetRequestIntegrationTest.kt b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/GetRequestIntegrationTest.kt
index 5aef9e0996..a95b389ff1 100644
--- a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/GetRequestIntegrationTest.kt
+++ b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/GetRequestIntegrationTest.kt
@@ -3,6 +3,7 @@ package com.bugsnag.android
 import okhttp3.Request
 import okhttp3.mockwebserver.MockResponse
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -50,7 +51,7 @@ class GetRequestIntegrationTest {
             assertEquals(0L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
@@ -109,7 +110,7 @@ class GetRequestIntegrationTest {
             assertEquals(0L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
@@ -164,7 +165,7 @@ class GetRequestIntegrationTest {
             assertEquals(0L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
diff --git a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/PostRequestIntegrationTest.kt b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/PostRequestIntegrationTest.kt
index 677732ea67..1e4665361e 100644
--- a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/PostRequestIntegrationTest.kt
+++ b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/PostRequestIntegrationTest.kt
@@ -10,6 +10,7 @@ import okhttp3.mockwebserver.MockResponse
 import okio.Buffer
 import okio.BufferedSink
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -68,7 +69,7 @@ class PostRequestIntegrationTest {
             assertEquals(49L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
@@ -96,7 +97,7 @@ class PostRequestIntegrationTest {
             assertEquals(11L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
@@ -133,7 +134,7 @@ class PostRequestIntegrationTest {
             assertEquals(11890L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
@@ -164,7 +165,7 @@ class PostRequestIntegrationTest {
             assertEquals(303L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
@@ -195,7 +196,7 @@ class PostRequestIntegrationTest {
             assertEquals(49L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
@@ -226,7 +227,7 @@ class PostRequestIntegrationTest {
             assertEquals(49L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
@@ -251,7 +252,7 @@ class PostRequestIntegrationTest {
             assertEquals(0L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(url, get("url"))
         }
     }
diff --git a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/RedirectedRequestIntegrationTest.kt b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/RedirectedRequestIntegrationTest.kt
index 8d3bd8b8c7..be405a6660 100644
--- a/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/RedirectedRequestIntegrationTest.kt
+++ b/bugsnag-plugin-android-okhttp/src/test/java/com/bugsnag/android/RedirectedRequestIntegrationTest.kt
@@ -6,6 +6,7 @@ import okhttp3.Request
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -68,7 +69,7 @@ class RedirectedRequestIntegrationTest {
             assertEquals(0L, get("requestContentLength"))
             assertEquals(0L, get("responseContentLength"))
             assertTrue(get("duration") is Long)
-            assertEquals(emptyMap<String, Any>(), get("urlParams"))
+            assertNull(get("urlParams"))
             assertEquals(server.url("/test").toString(), get("url"))
         }
     }