diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index 808f5d964b..9b96eb4b60 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -948,11 +948,21 @@
 		$qr_mode = '4';
 		$qr_size = '0.2';
 	}
-	else if ($_SESSION['theme']['qr_brand_type']['text'] == 'text' && $_SESSION['theme']['qr_brand_text']['text'] != '') {
+	elseif ($_SESSION['theme']['qr_brand_type']['text'] == 'image' && $_SESSION['theme']['qr_brand_image']['text'] == '') {
+		$qr_option = '';
+		$qr_mode = '3';
+		$qr_size = '0';
+	}
+	elseif ($_SESSION['theme']['qr_brand_type']['text'] == 'text' && $_SESSION['theme']['qr_brand_text']['text'] != '') {
 		$qr_option = 'label: "'.$_SESSION['theme']['qr_brand_text']['text'].'"';
 		$qr_mode = '2';
 		$qr_size = '0.05';
 	}
+	elseif ($_SESSION['theme']['qr_brand_type']['text'] == 'none') {
+		$qr_option = '';
+		$qr_mode = '3';
+		$qr_size = '0';
+	}
 	else {
 		echo "<img id='img-buffer' style='display: none;' src='".PROJECT_PATH."/themes/".$_SESSION["domain"]["template"]["name"]."/images/qr_code.png'>";
 		$qr_option = "image: $('#img-buffer')[0],";
diff --git a/app/contacts/contact_view.php b/app/contacts/contact_view.php
index c501800fda..80b9499401 100644
--- a/app/contacts/contact_view.php
+++ b/app/contacts/contact_view.php
@@ -166,11 +166,21 @@
 		$qr_mode = '4';
 		$qr_size = '0.2';
 	}
-	else if ($_SESSION['theme']['qr_brand_type']['text'] == 'text' && $_SESSION['theme']['qr_brand_text']['text'] != '') {
+	elseif ($_SESSION['theme']['qr_brand_type']['text'] == 'image' && $_SESSION['theme']['qr_brand_image']['text'] == '') {
+		$qr_option = '';
+		$qr_mode = '3';
+		$qr_size = '0';
+	}
+	elseif ($_SESSION['theme']['qr_brand_type']['text'] == 'text' && $_SESSION['theme']['qr_brand_text']['text'] != '') {
 		$qr_option = 'label: "'.$_SESSION['theme']['qr_brand_text']['text'].'"';
 		$qr_mode = '2';
 		$qr_size = '0.05';
 	}
+	elseif ($_SESSION['theme']['qr_brand_type']['text'] == 'none') {
+		$qr_option = '';
+		$qr_mode = '3';
+		$qr_size = '0';
+	}
 	else {
 		echo "<img id='img-buffer' style='display: none;' src='".PROJECT_PATH."/themes/".$_SESSION["domain"]["template"]["name"]."/images/qr_code.png'>";
 		$qr_option = "image: $('#img-buffer')[0],";
@@ -533,4 +543,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>