diff --git a/evmcc/test/ext/store_delete.evm b/evmcc/test/ext/store_delete.evm
new file mode 100644
index 000000000..d6acae03d
--- /dev/null
+++ b/evmcc/test/ext/store_delete.evm
@@ -0,0 +1 @@
+6104d26063576000606357
diff --git a/evmcc/test/ext/store_delete.lll b/evmcc/test/ext/store_delete.lll
new file mode 100644
index 000000000..3d8f0f23a
--- /dev/null
+++ b/evmcc/test/ext/store_delete.lll
@@ -0,0 +1,9 @@
+
+(asm 
+1234
+99
+SSTORE
+0
+99
+SSTORE
+)
\ No newline at end of file
diff --git a/libevmjit/Ext.cpp b/libevmjit/Ext.cpp
index bee65c564..09b350763 100644
--- a/libevmjit/Ext.cpp
+++ b/libevmjit/Ext.cpp
@@ -6,6 +6,7 @@
 #include <llvm/IR/IntrinsicInst.h>
 
 #include <libdevcrypto/SHA3.h>
+#include <libevm/FeeStructure.h>
 
 #include "Runtime.h"
 #include "Type.h"
@@ -179,7 +180,12 @@ extern "C"
 	{
 		auto index = llvm2eth(*_index);
 		auto value = llvm2eth(*_value);
-		_rt->getExt().setStore(index, value); // Interface uses native endianness
+		auto& ext = _rt->getExt();
+
+		if (value == 0 && ext.store(index) != 0)	// If delete
+			ext.sub.refunds += c_sstoreRefundGas;	// Increase refund counter
+
+		ext.setStore(index, value);	// Interface uses native endianness
 	}
 
 	EXPORT void ext_calldataload(Runtime* _rt, i256* _index, i256* _value)