diff --git a/src/browser/modules/Stream/CypherFrame/helpers.js b/src/browser/modules/Stream/CypherFrame/helpers.js
index 55ada7fae5..7585bc82b3 100644
--- a/src/browser/modules/Stream/CypherFrame/helpers.js
+++ b/src/browser/modules/Stream/CypherFrame/helpers.js
@@ -335,6 +335,10 @@ function mapNeo4jValuesToPlainValues (values) {
     return map(values, mapNeo4jValuesToPlainValues)
   }
 
+  if (isNeo4jValue(values)) {
+    return neo4jValueToPlainValue(values)
+  }
+
   // could be a Node or Relationship
   const type = lowerCase(get(values, 'constructor.name', ''))
 
@@ -351,10 +355,6 @@ function mapNeo4jValuesToPlainValues (values) {
     }
   }
 
-  if (isNeo4jValue(values)) {
-    return neo4jValueToPlainValue(values)
-  }
-
   return reduce(
     entries(values),
     (agg, [key, value]) => ({