diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index f83f7c464..ac4945f72 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -45,6 +45,8 @@ void arduino::MbedI2C::end() {
 	}
 #ifdef DEVICE_I2CSLAVE
 	if (slave != NULL) {
+		slave_th.terminate();
+		slave_th.free_stack();
 		delete slave;
 	}
 #endif