diff --git a/scumm/imuse_digi/dimuse_bndmgr.cpp b/scumm/imuse_digi/dimuse_bndmgr.cpp
index 7bc233df28e..f477892c140 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_bndmgr.cpp
@@ -206,12 +206,10 @@ int32 BundleMgr::decompressSampleByIndex(int32 index, int32 offset, int32 size,
 
 	int skip = offset - (first_block * 0x2000) + header_size;
 
-	// CMI hack: one more zero byte at the end of input buffer
-	comp_input = (byte *)malloc(0x2000);
-	comp_input[0x2000-1] = 0;
-
 	for (i = first_block; i <= last_block; i++) {
-		assert(0x2000 >= _compTable[i].size + 1);
+		// CMI hack: one more zero byte at the end of input buffer
+		comp_input = (byte *)malloc(_compTable[i].size + 1);
+		comp_input[_compTable[i].size] = 0;
 
 		byte *curBuf;
 		if (_lastBlock != i) {
@@ -239,11 +237,11 @@ int32 BundleMgr::decompressSampleByIndex(int32 index, int32 offset, int32 size,
 		final_size += output_size;
 		size -= output_size;
 		assert(size >= 0);
+		free(comp_input);
 		if (size == 0)
 			break;
 		skip = 0;
 	}
-	free(comp_input);
 	free(comp_output);
 
 	return final_size;