diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index 7a91028d6d..3ac6dd559d 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -1820,7 +1820,7 @@ abstract class Merge
 			// Don't break merge, just log it
 			error_log($e->getMessage());
 		}
-		return $replacements;
+		return $replacements ?: [];
 	}
 
 	/**