diff --git a/src/containers/Surah/index.js b/src/containers/Surah/index.js
index 1fad05a9b..c30708056 100644
--- a/src/containers/Surah/index.js
+++ b/src/containers/Surah/index.js
@@ -109,7 +109,8 @@ class Surah extends Component {
       this.props.isLoading !== nextProps.isLoading,
       this.props.isLoaded !== nextProps.isLoaded,
       this.props.options !== nextProps.options,
-      this.props.currentAyah !== nextProps.currentAyah
+      this.props.currentAyah !== nextProps.currentAyah,
+      this.props.isPlaying !== nextProps.isPlaying
     ];
 
     return conditions.some(condition => condition);
@@ -300,7 +301,7 @@ class Surah extends Component {
     return Object.values(ayahs).map(ayah => (
       <Ayah
         ayah={ayah}
-        isCurrentAyah={ayah.ayahKey === currentAyah}
+        isCurrentAyah={isPlaying && ayah.ayahKey === currentAyah}
         bookmarked={!!bookmarks[ayah.ayahKey]}
         tooltip={options.tooltip}
         bookmarkActions={actions.bookmark}