diff --git a/Source/Adobe.Target.Client/OnDevice/DecisioningDetailsExecutor.cs b/Source/Adobe.Target.Client/OnDevice/DecisioningDetailsExecutor.cs
index be10c2c..9e2b8bc 100644
--- a/Source/Adobe.Target.Client/OnDevice/DecisioningDetailsExecutor.cs
+++ b/Source/Adobe.Target.Client/OnDevice/DecisioningDetailsExecutor.cs
@@ -205,7 +205,7 @@ private static bool HandleMboxRequest(
                                 option.EventToken = null;
                                 return option;
                             })
-                        .Where(option => option.Type != null || option.Content != null)
+                        .Where(option => option.Type != null || option.Content != null || option.ResponseTokens != null)
                         .ToList(),
                     Trace = traceHandler?.CurrentTrace,
                 };
@@ -249,7 +249,7 @@ private static bool HandlePageLoad(
                         option.EventToken = null;
                     }
 
-                    if (option.Type == null && option.Content == null && option.EventToken == null)
+                    if (option.Type == null && option.Content == null && option.EventToken == null && option.ResponseTokens == null)
                     {
                         continue;
                     }
diff --git a/Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_AB.json b/Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_AB.json
index 7194a66..72824f6 100644
--- a/Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_AB.json
+++ b/Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_AB.json
@@ -68,6 +68,9 @@
                     }
                   }
                 ]
+              },
+              {
+                "responseTokens":  {}
               }
             ],
             "metrics": [
@@ -173,6 +176,15 @@
                     }
                   }
                 ]
+              },
+              {
+                "responseTokens":  {}
+              },
+              {
+                "responseTokens":  {}
+              },
+              {
+                "responseTokens":  {}
               }
             ],
             "metrics": [
@@ -301,6 +313,21 @@
                     }
                   }
                 ]
+              },
+              {
+                "responseTokens":  {}
+              },
+              {
+                "responseTokens":  {}
+              },
+              {
+                "responseTokens":  {}
+              },
+              {
+                "responseTokens":  {}
+              },
+              {
+                "responseTokens":  {}
               }
             ],
             "metrics": [
diff --git a/Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_XT.json b/Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_XT.json
index 1572078..c19dfa1 100644
--- a/Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_XT.json
+++ b/Tests/Adobe.Target.Client.Test/Models/TEST_SUITE_PAGELOAD_VEC_XT.json
@@ -59,6 +59,12 @@
                     "content": "greg is correct"
                   }
                 ]
+              },
+              {
+                "responseTokens":  {}
+              },
+              {
+                "responseTokens":  {}
               }
             ],
             "metrics": [
@@ -123,6 +129,12 @@
                     "content": "jason is correct"
                   }
                 ]
+              },
+              {
+                "responseTokens":  {}
+              },
+              {
+                "responseTokens":  {}
               }
             ],
             "metrics": [
@@ -183,6 +195,12 @@
                     "content": "all visitors"
                   }
                 ]
+              },
+              {
+                "responseTokens":  {}
+              },
+              {
+                "responseTokens":  {}
               }
             ],
             "metrics": [
diff --git a/Tests/Adobe.Target.Client.Test/Util/IntegrationTestUtils.cs b/Tests/Adobe.Target.Client.Test/Util/IntegrationTestUtils.cs
index 3e4493f..5ffd6a4 100644
--- a/Tests/Adobe.Target.Client.Test/Util/IntegrationTestUtils.cs
+++ b/Tests/Adobe.Target.Client.Test/Util/IntegrationTestUtils.cs
@@ -163,7 +163,7 @@ private static EquivalencyAssertionOptions<T> NestedResponseEquivalenceOptions<T
                 .ComparingByMembers<Action>()
                 .Using<Dictionary<string, object>>(ctx =>
                 {
-                    if (ctx.Expectation == null)
+                    if (ctx.Expectation == null || ctx.Expectation.Count == 0)
                     {
                         return;
                     }