diff --git a/xxclient/src/main/java/io/elixxir/xxclient/models/BindingsModel.kt b/xxclient/src/main/java/io/elixxir/xxclient/models/BindingsModel.kt
index 591fe84c794ee37d15010330a93c1cde0fddbcc7..3a272bf544721d57d366b38dbda689550fac9fdc 100644
--- a/xxclient/src/main/java/io/elixxir/xxclient/models/BindingsModel.kt
+++ b/xxclient/src/main/java/io/elixxir/xxclient/models/BindingsModel.kt
@@ -19,7 +19,7 @@ interface BindingsModel {
 
         inline fun <reified T> decode(data: ByteArray?): T? {
             return data?.run {
-                if (isNotEmpty()) {
+                if (isNotEmpty() && decodeToString() != "null") {
                     val typeToken = object : TypeToken<T>() {}.type
                     Gson().fromJson<T>(decodeToString(), typeToken)
                 } else {
@@ -31,7 +31,7 @@ interface BindingsModel {
 
         inline fun <reified T> decodeArray(data: ByteArray?): List<T> {
             return data?.run {
-                if (isNotEmpty()) {
+                if (isNotEmpty() && decodeToString() != "null") {
                     val typeToken = object : TypeToken<Array<T>>() {}.type
                     Gson().fromJson<Array<T>>(decodeToString(), typeToken).toList()
                 } else listOf()