diff --git a/sbroad-core/src/executor/result.rs b/sbroad-core/src/executor/result.rs
index b78a2d787026ca7dea02bc909cba6daec1ea6ea5..c199e6e4e717acec5434cbb97c4976b3a39dfbe9 100644
--- a/sbroad-core/src/executor/result.rs
+++ b/sbroad-core/src/executor/result.rs
@@ -98,6 +98,7 @@ impl TryInto<Column> for &MetadataColumn {
                 ColumnRole::User,
                 true,
             )),
+            "uuid" => Ok(Column::new(&self.name, Type::Uuid, ColumnRole::User, true)),
             "unsigned" => Ok(Column::new(
                 &self.name,
                 Type::Unsigned,
diff --git a/sbroad-core/src/ir/relation.rs b/sbroad-core/src/ir/relation.rs
index 9ae2e0836cc0931a04709e0b137c67e25923e3da..145b1b0f6fde93231ea2a729ad66d6065b391976 100644
--- a/sbroad-core/src/ir/relation.rs
+++ b/sbroad-core/src/ir/relation.rs
@@ -117,9 +117,9 @@ impl TryFrom<SpaceFieldType> for Type {
             SpaceFieldType::String => Ok(Type::String),
             SpaceFieldType::Unsigned => Ok(Type::Unsigned),
             SpaceFieldType::Array => Ok(Type::Array),
+            SpaceFieldType::Uuid => Ok(Type::Uuid),
             SpaceFieldType::Any
             | SpaceFieldType::Varbinary
-            | SpaceFieldType::Uuid
             | SpaceFieldType::Map
             | SpaceFieldType::Interval
             | SpaceFieldType::Datetime => Err(SbroadError::NotImplemented(