diff --git a/substrate/wasm-runtime/support/src/lib.rs b/substrate/wasm-runtime/support/src/lib.rs
index d0b4c8a799..1f71973c18 100644
--- a/substrate/wasm-runtime/support/src/lib.rs
+++ b/substrate/wasm-runtime/support/src/lib.rs
@@ -139,8 +139,12 @@ macro_rules! impl_stubs {
 			$(
 				#[no_mangle]
 				pub fn $name(input_data: *mut u8, input_len: usize) -> u64 {
-					let input = unsafe {
-						$crate::vec::Vec::from_raw_parts(input_data, input_len, input_len)
+					let input = if input_len == 0 {
+						$crate::vec::Vec::new()
+					} else {
+						unsafe {
+							$crate::vec::Vec::from_raw_parts(input_data, input_len, input_len)
+						}
 					};
 
 					let output = super::$name(&input[..]);
diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm
index dfff5d575e..68996e2c26 100644
Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm differ
diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm
index 441bee2cd5..0deae851a2 100644
Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm differ
diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm
index 3ae531562e..d5026fc30a 100644
Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm differ
diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.wasm
index ac94a72cde..df28ddb3cb 100644
Binary files a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.wasm and b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.wasm differ
diff --git a/substrate/wasm-runtime/test/src/lib.rs b/substrate/wasm-runtime/test/src/lib.rs
index 2b9a21c17f..ed4610a4df 100644
--- a/substrate/wasm-runtime/test/src/lib.rs
+++ b/substrate/wasm-runtime/test/src/lib.rs
@@ -54,8 +54,6 @@ fn test_panic(_input: &[u8]) -> Vec<u8> {
 fn test_conditional_panic(input: &[u8]) -> Vec<u8> {
 	if input.len() > 0 {
 		panic!("test panic");
-	} else {
-		assert!(input.len() > 0);
 	}
 	input.to_vec()
 }