|  | @@ -416,7 +416,8 @@ class ContentApi(object):
 | 
	
		
			
			| 416 | 416 |          :param workspace: The workspace's content
 | 
	
		
			
			| 417 | 417 |          :return The corresponding Content
 | 
	
		
			
			| 418 | 418 |          """
 | 
	
		
			
			| 419 |  | -        query = self._base_query(content_parent.workspace)
 | 
	
		
			
			|  | 419 | +        workspace = content_parent.workspace if content_parent else None
 | 
	
		
			
			|  | 420 | +        query = self._base_query(workspace)
 | 
	
		
			
			| 420 | 421 |          parent_id = content_parent.content_id if content_parent else None
 | 
	
		
			
			| 421 | 422 |          query = query.filter(Content.parent_id == parent_id)
 | 
	
		
			
			| 422 | 423 |  
 |