diff --git a/lib/ShapedJson/Legends.h b/lib/ShapedJson/Legends.h
index 488825db12..5d423cf64f 100644
--- a/lib/ShapedJson/Legends.h
+++ b/lib/ShapedJson/Legends.h
@@ -321,6 +321,11 @@ namespace triagens {
         }
 
         TRI_shape_t const* lookupShapeIdMethod (TRI_shape_sid_t const sid) {
+          // Is it a builtin basic one?
+          if (sid < TRI_FirstCustomShapeIdShaper()) {
+            return TRI_LookupSidBasicShapeShaper(sid);
+          }
+
           // binary search in Shapes
           TRI_shape_size_t low = 0;
           TRI_shape_size_t high = _numberShapes;