diff --git a/lib/transformers/EndpointMapToArray.php b/lib/transformers/EndpointMapToArray.php
index 76fd5beb7bc3b66665bfadfeef18765686388839..e0bf6b5d36ec386f78bf1c5c1668bd1bf6171581 100644
--- a/lib/transformers/EndpointMapToArray.php
+++ b/lib/transformers/EndpointMapToArray.php
@@ -65,8 +65,12 @@ class EndpointMapToArray extends AttributeTransformer
         }
         $endpointMap = $fullBindingNames;
 
-        // if all endpoints use the default binding
-        if (count($endpointMap) === 1 && isset($endpointMap[$this->defaultBinding])) {
+        // if all endpoints use the default binding and there are no spaces
+        if (count($endpointMap) === 1 && isset($endpointMap[$this->defaultBinding])
+            && strpos(
+                $endpointMap[$this->defaultBinding],
+                self::MAPLIST_SEPARATOR . self::MAPLIST_SEPARATOR
+            ) === false) {
             $result = explode(self::MAPLIST_SEPARATOR, $endpointMap[$this->defaultBinding]);
             return count($result) === 1 ? $result[0] : $result;
         }