diff --git a/src/W800 SDK v1.00.08/app/app_drivers/i2c/i2c.c b/src/W800 SDK v1.00.08/app/app_drivers/i2c/i2c.c
index 339dee2..3d14cf0 100644
--- a/src/W800 SDK v1.00.08/app/app_drivers/i2c/i2c.c	
+++ b/src/W800 SDK v1.00.08/app/app_drivers/i2c/i2c.c	
@@ -15,11 +15,22 @@ bool i2c_write(uint8_t address, uint8_t reg, const uint8_t *const data, size_t l
 {
     if(!data) return false;
 
+    __disable_irq();
+
     //First we send the address followed by the register from where we want to start writing:
     tls_i2c_write_byte(address << 1, true);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
+
     tls_i2c_write_byte(reg, false);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
 
     for(size_t i = 0; i < length; i++)
     {
@@ -27,25 +38,45 @@ bool i2c_write(uint8_t address, uint8_t reg, const uint8_t *const data, size_t l
         if(tls_i2c_wait_ack() != WM_SUCCESS)
         {
             tls_i2c_stop();
+            __enable_irq();
             return false;
         }
     }
 
     tls_i2c_stop();
+    __enable_irq();
 
     return true;
 }
 
 bool i2c_write_reg(uint8_t address, uint8_t reg, uint8_t data)
 {
+    __disable_irq();
+
     //First we send the address followed by the register we want to write to:
     tls_i2c_write_byte(address << 1, true);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
+
     tls_i2c_write_byte(reg, false);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
+
     tls_i2c_write_byte(data, false);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
+
     tls_i2c_stop();
+    __enable_irq();
 
     return true;
 }
@@ -54,14 +85,29 @@ bool i2c_read(uint8_t address, uint8_t reg, uint8_t * const data, size_t length)
 {
     if(!data)return false;
 
+    __disable_irq();
+
     //First we send the address followed by the register from where we want to start reading:
     tls_i2c_write_byte(address << 1, true);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
+
     tls_i2c_write_byte(reg, false);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
 
     tls_i2c_write_byte((address << 1) | 1, true);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
 
     for(size_t i = 0; i < length - 1; i++ )
     {
@@ -70,21 +116,41 @@ bool i2c_read(uint8_t address, uint8_t reg, uint8_t * const data, size_t length)
 
     data[length - 1] = tls_i2c_read_byte(false, true);
 
+    __enable_irq();
+
     return true;
 }
 
 bool i2c_read_reg(uint8_t address, uint8_t reg, uint8_t * const data)
 {
+    __disable_irq();
+
     //First we send the address followed by the register we want to read from:
     tls_i2c_write_byte(address << 1, true);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
-    tls_i2c_write_byte(reg, false);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
 
-    tls_i2c_write_byte((address << 1) | 1, true);
-    if(tls_i2c_wait_ack() != WM_SUCCESS) return false;
+    tls_i2c_write_byte(reg, false);
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
+
+    tls_i2c_write_byte(address << 1 | 1, true);
+    if(tls_i2c_wait_ack() != WM_SUCCESS)
+    {
+        __enable_irq();
+        return false;
+    }
 
     uint8_t val = tls_i2c_read_byte(false, true);
+
+    __enable_irq();
+
     if(data) *data = val;
     
     return true;