diff --git a/GanjooRazor/Areas/User/Pages/VerseAdd.cshtml b/GanjooRazor/Areas/User/Pages/VerseAdd.cshtml
index 6f256af7..e74184a9 100644
--- a/GanjooRazor/Areas/User/Pages/VerseAdd.cshtml
+++ b/GanjooRazor/Areas/User/Pages/VerseAdd.cshtml
@@ -14,7 +14,7 @@
     <meta name="robots" content="noindex, nofollow" />
     <title>پیشنهاد اضافه شدن مصرع‌های جا افتاده</title>
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link href="/css/user-panel.css?version=1" rel="stylesheet" type="text/css" />
 </head>
 <body>
diff --git a/GanjooRazor/Pages/Auth/Login.cshtml b/GanjooRazor/Pages/Auth/Login.cshtml
index 45a364fd..fd985363 100644
--- a/GanjooRazor/Pages/Auth/Login.cshtml
+++ b/GanjooRazor/Pages/Auth/Login.cshtml
@@ -13,7 +13,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
 </head>
 <body class="bk-background">
     <div id="hdr">
diff --git a/GanjooRazor/Pages/Auth/ResetPassword.cshtml b/GanjooRazor/Pages/Auth/ResetPassword.cshtml
index dc7f329e..93157fe0 100644
--- a/GanjooRazor/Pages/Auth/ResetPassword.cshtml
+++ b/GanjooRazor/Pages/Auth/ResetPassword.cshtml
@@ -11,7 +11,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
 </head>
 <body class="bk-background">
     <div id="hdr">
diff --git a/GanjooRazor/Pages/Auth/SignUp.cshtml b/GanjooRazor/Pages/Auth/SignUp.cshtml
index f3fa6d91..500dd395 100644
--- a/GanjooRazor/Pages/Auth/SignUp.cshtml
+++ b/GanjooRazor/Pages/Auth/SignUp.cshtml
@@ -12,7 +12,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
 </head>
 <body class="bk-background">
     <div id="hdr">
diff --git a/GanjooRazor/Pages/CommentReports/ReportComment.cshtml b/GanjooRazor/Pages/CommentReports/ReportComment.cshtml
index 46c50e2e..9a8dc07a 100644
--- a/GanjooRazor/Pages/CommentReports/ReportComment.cshtml
+++ b/GanjooRazor/Pages/CommentReports/ReportComment.cshtml
@@ -11,7 +11,7 @@
     <meta name="robots" content="noindex, nofollow" />
     <title>درخواست حذف حاشیه</title>
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <style>
         label {
             width: 100px;
diff --git a/GanjooRazor/Pages/Error.cshtml b/GanjooRazor/Pages/Error.cshtml
index 10ef84e1..e6078aa2 100644
--- a/GanjooRazor/Pages/Error.cshtml
+++ b/GanjooRazor/Pages/Error.cshtml
@@ -13,7 +13,7 @@
     <title>
         @ViewData["Title"]
     </title>
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
 
diff --git a/GanjooRazor/Pages/ImageRecommendation/Pin.cshtml b/GanjooRazor/Pages/ImageRecommendation/Pin.cshtml
index 672e3826..f832fe5b 100644
--- a/GanjooRazor/Pages/ImageRecommendation/Pin.cshtml
+++ b/GanjooRazor/Pages/ImageRecommendation/Pin.cshtml
@@ -12,7 +12,7 @@
     <meta name="robots" content="noindex, nofollow" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link href="/css/spotify.css" rel="stylesheet" type="text/css" />
 
     <script src="/lib/jquery/dist/jquery.min.js"></script>
diff --git a/GanjooRazor/Pages/Map.cshtml b/GanjooRazor/Pages/Map.cshtml
index abc4e5a7..c5392100 100644
--- a/GanjooRazor/Pages/Map.cshtml
+++ b/GanjooRazor/Pages/Map.cshtml
@@ -12,7 +12,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="description" content="سخنوران و نویسندگان گنجور روی نقشهٔ جغرافیایی" />
     <meta charset="utf-8" />
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link rel="stylesheet" href="/css/leaflet.css?version=2" />
     <style>
         .leaflet-container {
@@ -23,7 +23,7 @@
             font-family: 'Vazirmatn'
         }
     </style>
-    <script src="/js/bk.js?version=89"></script>
+    <script src="/js/bk.js?version=90"></script>
     <script src="~/js/jquery-1.10.2.min.js"></script>
     <script src="~/js/leaflet.js"></script>
     <script src="~/js/leaflet-providers.js"></script>
diff --git a/GanjooRazor/Pages/Misc/Photos.cshtml b/GanjooRazor/Pages/Misc/Photos.cshtml
index 3754a1d5..ec19ce79 100644
--- a/GanjooRazor/Pages/Misc/Photos.cshtml
+++ b/GanjooRazor/Pages/Misc/Photos.cshtml
@@ -11,11 +11,11 @@
     <title>
         @Html.Raw(ViewData["Title"])
     </title>
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=89"></script>
+    <script src="/js/bk.js?version=90"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Recitations/AudioClip.cshtml b/GanjooRazor/Pages/Recitations/AudioClip.cshtml
index 2b9938a7..7c2d3f60 100644
--- a/GanjooRazor/Pages/Recitations/AudioClip.cshtml
+++ b/GanjooRazor/Pages/Recitations/AudioClip.cshtml
@@ -15,7 +15,7 @@
         گنجور » نمایش خوانش
     </title>
     <link href="~/dist/skin/pink.flag/css/jplayer.pink.flag.min.css" rel="stylesheet" type="text/css" />
-    <link href="~/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="~/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script>
@@ -150,7 +150,7 @@
         </p>
 
         <script src="~/lib/jquery/dist/jquery.min.js"></script>
-        <script src="~/js/bk.js?version=89"></script>
+        <script src="~/js/bk.js?version=90"></script>
         <script src="~/js/jplayersupport.js"></script>
         <script src="~/js/vaabd.js?version=10"></script>
         <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Recitations/RecitationsOrder.cshtml b/GanjooRazor/Pages/Recitations/RecitationsOrder.cshtml
index 901d5fba..0fc06721 100644
--- a/GanjooRazor/Pages/Recitations/RecitationsOrder.cshtml
+++ b/GanjooRazor/Pages/Recitations/RecitationsOrder.cshtml
@@ -12,7 +12,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex, nofollow" />
     <title>اطلاعات رتبه‌بندی خوانش‌های شعر</title>
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
 
 </head>
 <body>
diff --git a/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml b/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml
index db022527..6529f0de 100644
--- a/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml
+++ b/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml
@@ -13,7 +13,7 @@
     <meta name="robots" content="noindex, nofollow" />
     <title>گنجور » گزارش خطا در خوانش</title>
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link href="~/dist/skin/pink.flag/css/jplayer.pink.flag.min.css" rel="stylesheet" type="text/css" />
     <style>
         label {
@@ -238,7 +238,7 @@
 
 
 
-                <script src="~/js/bk.js?version=89"></script>
+                <script src="~/js/bk.js?version=90"></script>
                 <script src="~/js/jplayersupport.js"></script>
                 <script src="~/js/vaabd.js?version=10"></script>
                 <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
index 1e901a68..c4378ae6 100644
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
     <link href="/dist/skin/blue.monday/css/jplayer.blue.monday.min.css" rel="stylesheet" type="text/css" />
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link href="/css/user-panel.css?version=3" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
@@ -36,7 +36,7 @@
         });
     </script>
 
-    <script src="/js/bk.js?version=89"></script>
+    <script src="/js/bk.js?version=90"></script>
     <script>
         function editBanner(bannerId) {
             var url = '?handler=Edit';
diff --git a/GanjooRazor/Pages/Shared/_Layout.cshtml b/GanjooRazor/Pages/Shared/_Layout.cshtml
index 8adeeea1..24b15e55 100644
--- a/GanjooRazor/Pages/Shared/_Layout.cshtml
+++ b/GanjooRazor/Pages/Shared/_Layout.cshtml
@@ -30,11 +30,11 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>@Html.Raw(ViewData["Title"])</title>
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=89"></script>
+    <script src="/js/bk.js?version=90"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
index ecc566b3..40c21733 100644
--- a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
@@ -9,7 +9,7 @@
     </title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link href="/css/user-panel.css?version=3" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
@@ -33,7 +33,7 @@
         });
     </script>
     <script src="/lib/diff.js"></script>
-    <script src="/js/bk.js?version=89"></script>
+    <script src="/js/bk.js?version=90"></script>
     <script>
         function compareCorrectionBlocks(originalElemenyId, editedElementId, resultElementId) {
             var a = document.getElementById(originalElemenyId);
diff --git a/GanjooRazor/Pages/SongRecommendation/Bp.cshtml b/GanjooRazor/Pages/SongRecommendation/Bp.cshtml
index 7ff5159c..a3050aa9 100644
--- a/GanjooRazor/Pages/SongRecommendation/Bp.cshtml
+++ b/GanjooRazor/Pages/SongRecommendation/Bp.cshtml
@@ -12,7 +12,7 @@
     <meta name="robots" content="noindex, nofollow" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link href="/css/spotify.css" rel="stylesheet" type="text/css" />
 
     <script src="/lib/jquery/dist/jquery.min.js"></script>
diff --git a/GanjooRazor/Pages/SongRecommendation/Golha.cshtml b/GanjooRazor/Pages/SongRecommendation/Golha.cshtml
index 4104cf79..85898dce 100644
--- a/GanjooRazor/Pages/SongRecommendation/Golha.cshtml
+++ b/GanjooRazor/Pages/SongRecommendation/Golha.cshtml
@@ -11,7 +11,7 @@
     <meta name="robots" content="noindex, nofollow" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />    
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link href="/css/spotify.css" rel="stylesheet" type="text/css" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/js/golha.js"></script>
diff --git a/GanjooRazor/Pages/SongRecommendation/Spotify.cshtml b/GanjooRazor/Pages/SongRecommendation/Spotify.cshtml
index 62061608..b9882a21 100644
--- a/GanjooRazor/Pages/SongRecommendation/Spotify.cshtml
+++ b/GanjooRazor/Pages/SongRecommendation/Spotify.cshtml
@@ -12,7 +12,7 @@
     <meta name="robots" content="noindex, nofollow" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link href="/css/spotify.css" rel="stylesheet" type="text/css" />
 
     <script src="/lib/jquery/dist/jquery.min.js"></script>
diff --git a/GanjooRazor/Pages/errors/404.cshtml b/GanjooRazor/Pages/errors/404.cshtml
index 8c2cde9c..cca87a99 100644
--- a/GanjooRazor/Pages/errors/404.cshtml
+++ b/GanjooRazor/Pages/errors/404.cshtml
@@ -13,7 +13,7 @@
     <title>
         @ViewData["Title"]
     </title>
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
 
diff --git a/GanjooRazor/Pages/errors/503.cshtml b/GanjooRazor/Pages/errors/503.cshtml
index 0cb8de4e..1182be43 100644
--- a/GanjooRazor/Pages/errors/503.cshtml
+++ b/GanjooRazor/Pages/errors/503.cshtml
@@ -14,7 +14,7 @@
     <title>
         @ViewData["Title"]
     </title>
-    <link href="/css/p8.css?version=89" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=90" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
 
diff --git a/GanjooRazor/wwwroot/js/bk.js b/GanjooRazor/wwwroot/js/bk.js
index bf89edfc..1f9fee56 100644
--- a/GanjooRazor/wwwroot/js/bk.js
+++ b/GanjooRazor/wwwroot/js/bk.js
@@ -365,6 +365,19 @@ function fillnarrations(coupletIndex) {
     for (var i = 0; i < narrators.length; i++) {
         $(comboId).append(new Option(narrators[i].replace(/<\/?[^>]+(>|$)/g, "").replace('به خوانش ', '').replace('می‌خواهید شما بخوانید؟ اینجا را ببینید.', '').replace('(دریافت)', ''), i));
     }
+
+    // default the combobox to whichever recitation is currently playing at the
+    // page level (currentAudio is set/updated by _AudioPlayerPartial.cshtml's
+    // 'play' listener, which fires for both page-level play buttons and
+    // playCouplet()'s own audioControl.play() call, so this stays in sync
+    // both ways without any extra wiring)
+    if (typeof currentAudio !== "undefined" && currentAudio != null) {
+        var currentAudioId = parseInt(currentAudio.id.replace('audio-', ''));
+        var currentIndex = recitaionIds.indexOf(currentAudioId);
+        if (currentIndex != -1) {
+            $(comboId).val(currentIndex);
+        }
+    }
 }
 
 function getVerseIndexFromCoupleIndex(coupletIndex) {