diff --git a/raspi-config b/raspi-config
index ad4afef..2923da4 100755
--- a/raspi-config
+++ b/raspi-config
@@ -682,7 +682,8 @@ do_i2c() {
 
 do_serial() {
   DEFAULT=
-  if ! grep -q "console=ttyAMA0" /boot/cmdline.txt && ! grep -q "console=serial0" /boot/cmdline.txt ; then
+  CUR_SERIAL=$(get_serial)
+  if [ $CUR_SERIAL -eq 1 ] ; then
       DEFAULT=--defaultno
   fi