diff --git a/mobile/tail.php b/mobile/tail.php
index a3ce2e361..1ef67d14b 100644
--- a/mobile/tail.php
+++ b/mobile/tail.php
@@ -40,7 +40,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 </footer>
 
-<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING'].'&amp;':'?').'device=pc'; ?>" id="device_change">PC 버전으로 보기</a>
+<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.str_replace("&", "&amp;", $_SERVER['QUERY_STRING']).'&amp;':'?').'device=pc'; ?>" id="device_change">PC 버전으로 보기</a>
 
 <?php
 include_once(G4_PATH."/tail.sub.php");
diff --git a/tail.php b/tail.php
index acdd33e30..74fb21c29 100644
--- a/tail.php
+++ b/tail.php
@@ -32,8 +32,8 @@ if ($config['cf_include_tail']) {
     </div>
 </footer>
 
-<?php if(!G4_IS_MOBILE){ ?>
-<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING'].'&amp;':'?').'device=mobile'; ?>" id="device_change">모바일 버전으로 보기</a>
+<?php if(!G4_IS_MOBILE) { ?>
+<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.str_replace("&", "&amp;", $_SERVER['QUERY_STRING']).'&amp;':'?').'device=mobile'; ?>" id="device_change">모바일 버전으로 보기</a>
 <?php } ?>
 
 <?php