diff --git a/Core.class.php b/Core.class.php
index e0bec676..13f5ca43 100644
--- a/Core.class.php
+++ b/Core.class.php
@@ -237,7 +237,7 @@ public function processQuickCreate($tech, $extension, $data) {
 		$settings['callerid']['value'] = isset($data['callerid']) ? $data['callerid'] : '' ;
 
         if($tech == "pjsip"){
-            $settings['dtmfmode']['value'] = isset($data['dtmfmode']) ? $data['dtmfmode'] : "rfc4733";
+            $settings['dtmfmode']['value'] = isset($data['dtmfmode']) ? $data['dtmfmode'] : ($settings['dtmfmode']['value'] ?: "rfc4733");
             $settings['defaultuser']['value'] = isset($data['defaultuser']) ? $data['defaultuser'] : "";
             $settings['trustrpid']['value'] = isset($data['trustrpid']) ? $data['trustrpid'] : "yes";
             $settings['send_connected_line']['value'] = isset($data['send_connected_line']) ? $data['send_connected_line'] : "yes";
diff --git a/functions.inc/drivers/Sip.class.php b/functions.inc/drivers/Sip.class.php
index 599c31a3..51bd3ee6 100644
--- a/functions.inc/drivers/Sip.class.php
+++ b/functions.inc/drivers/Sip.class.php
@@ -307,7 +307,8 @@ public function getDeviceDisplay($display, $deviceInfo, $currentcomponent, $prim
 		$select[] = array('value' => 'info', 'text' => _('SIP INFO (application/dtmf-relay)'));
 		$select[] = array('value' => 'inband', 'text' => _('In band audio (Not recommended)'));
 		$tt = _("The DTMF signaling mode used by this device, usually RFC for most phones.").' [dtmfmode]';
-		$tmparr['dtmfmode'] = array('prompttext' => _('DTMF Signaling'), 'value' => 'rfc2833', 'tt' => $tt, 'select' => $select, 'level' => 0);
+		$DEVICE_SIP_DTMF = $this->freepbx->Config->get_conf_setting('DEVICE_SIP_DTMF') ?: 'rfc2833';
+		$tmparr['dtmfmode'] = array('prompttext' => _('DTMF Signaling'), 'value' => $DEVICE_SIP_DTMF, 'tt' => $tt, 'select' => $select, 'level' => 0);
 
 		unset($select);
 		$tt = _("Re-Invite policy for this device, see Asterisk documentation for details.").' [canreinvite]';