diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php
index 0cc0ee6..c6f6767 100644
--- a/Sccp_manager.class.php
+++ b/Sccp_manager.class.php
@@ -163,10 +163,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
             $this->initVarfromXml(); // Overwrite Exist
         }
 
-        if (get_class($freepbx) === 'FreePBX') {
+        //if (get_class($freepbx) === 'FreePBX') {
             // only save settings when building a new FreePBX object
             $this->saveSccpSettings();
-        }
+        //}
     }
 
     /*
diff --git a/sccpManClasses/dbinterface.class.php b/sccpManClasses/dbinterface.class.php
index 2a5e071..5fa736c 100644
--- a/sccpManClasses/dbinterface.class.php
+++ b/sccpManClasses/dbinterface.class.php
@@ -239,7 +239,6 @@ class dbinterface
         // mode update - update / replace record
         $dbh = \FreePBX::Database();
         $result = false;
-        $delete_value = array();
         switch ($table_name) {
             case 'sccpsettings':
                 if ($mode == 'replace') {  // Change mode name to be more transparent
@@ -250,9 +249,8 @@ class dbinterface
                 }
                 foreach ($save_value as $key => $dataArr) {
                     if (!empty($dataArr) && isset($dataArr['data'])) {
-                        if ($dataArr['data'] == $this->val_null) {
-                              $delete_value[] = $save_value[$key]['keyword'];
-                              break;
+                        if (empty($dataArr['data'])) {
+                            continue;
                         }
                     }
                     $stmt->bindParam(':keyword',$dataArr['keyword'],\PDO::PARAM_STR);
@@ -261,13 +259,6 @@ class dbinterface
                     $stmt->bindParam(':type',$dataArr['type'],\PDO::PARAM_INT);
                     $result = $stmt->execute();
                 }
-                if (!empty($delete_value)) {
-                    $stmt = $dbh->prepare('DELETE FROM sccpsettings WHERE keyword = :keyword');
-                    foreach ($delete_value as $del_key) {
-                        $stmt->bindParam(':keyword',$del_key,\PDO::PARAM_STR);
-                        $result = $stmt->execute();
-                    }
-                }
                 break;
             case 'sccpdevmodel':    // Fall through to next intentionally
             case 'sccpdevice':      // Fall through to next intentionally