diff --git a/src/Controllers/Storage/DataController.cs b/src/Controllers/Storage/DataController.cs
index 7dc0c4d7..88c164b6 100644
--- a/src/Controllers/Storage/DataController.cs
+++ b/src/Controllers/Storage/DataController.cs
@@ -282,6 +282,11 @@ public async Task<ActionResult<DataElement>> CreateAndUploadData(
             newData.Filename = HttpUtility.UrlDecode(newData.Filename);
             (long length, DateTimeOffset blobTimestamp) = await _dataRepository.WriteDataToStorage(instance.Org, theStream, newData.BlobStoragePath);
             newData.Size = length;
+            if (length == 0)
+            {
+                await _dataRepository.DeleteDataInStorage(instance.Org, newData.BlobStoragePath);
+                return BadRequest("Empty stream provided. Cannot persist data.");
+            }
 
             if (User.GetOrg() == instance.Org)
             {