diff --git a/lib/api/ktcmis/objecttypes/CMISDocumentObject.inc.php b/lib/api/ktcmis/objecttypes/CMISDocumentObject.inc.php
index 1ca2af6..319ff4c 100644
--- a/lib/api/ktcmis/objecttypes/CMISDocumentObject.inc.php
+++ b/lib/api/ktcmis/objecttypes/CMISDocumentObject.inc.php
@@ -121,7 +121,8 @@ class CMISDocumentObject extends CMISBaseObject {
                                      . $objectProperties['document_id']);
         // NOTE what about instead creating a downloadable version with appropriate link?  see ktapi::download_document
         //      also ktapidocument::get_download_url
-        $this->_setPropertyInternal('Uri', $uri);
+//        $this->_setPropertyInternal('Uri', $uri);
+        $this->_setPropertyInternal('Uri', '');
         // TODO what is this?  Assuming it is the object type id, and not OUR document type?
         $this->_setPropertyInternal('ObjectTypeId', $this->getAttribute('typeId'));
         // Needed to distinguish type
diff --git a/lib/api/ktcmis/objecttypes/CMISFolderObject.inc.php b/lib/api/ktcmis/objecttypes/CMISFolderObject.inc.php
index 8e6d41e..f23cdac 100644
--- a/lib/api/ktcmis/objecttypes/CMISFolderObject.inc.php
+++ b/lib/api/ktcmis/objecttypes/CMISFolderObject.inc.php
@@ -99,7 +99,8 @@ class CMISFolderObject extends CMISBaseObject {
                                      . '/browse.php?fFolderId='
                                      . $objectProperties['id']);
         // TODO this url is probably incorrect...needs to be checked
-        $this->_setPropertyInternal('Uri', $uri);
+//        $this->_setPropertyInternal('Uri', $uri);
+        $this->_setPropertyInternal('Uri', '');
         // TODO what is this?  Assuming it is the object type id, and not OUR document type?
         $this->_setPropertyInternal('ObjectTypeId', $this->getAttribute('typeId'));
         // Needed to distinguish type
diff --git a/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php b/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
index adcf420..cd4b6a8 100644
--- a/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
+++ b/webservice/atompub/cmis/KT_cmis_atom_service_helper.inc.php
@@ -191,7 +191,9 @@ class KT_cmis_atom_service_helper {
         {
             $propElement = $feed->newElement('cmis:' . $property['type']);
             $propElement->appendChild($feed->newAttr('cmis:name', $propertyName));
-            $feed->newField('cmis:value', CMISUtil::boolToString($property['value']), $propElement);
+            if (!empty($property['value'])) {
+                $feed->newField('cmis:value', CMISUtil::boolToString($property['value']), $propElement);
+            }
             $propertiesElement->appendChild($propElement);
         }