diff --git a/src/components/Audioplayer/RepeatDropdown/index.js b/src/components/Audioplayer/RepeatDropdown/index.js
index 22ae916be..b5ff5d1db 100644
--- a/src/components/Audioplayer/RepeatDropdown/index.js
+++ b/src/components/Audioplayer/RepeatDropdown/index.js
@@ -72,18 +72,27 @@ class RepeatButton extends Component {
             <FormControl
               componentClass="select"
               value={repeat.from}
-              onChange={event => setRepeat({
-                ...repeat,
-                from: parseInt(event.target.value, 10),
-                to: parseInt(event.target.value, 10) + 3
-              })}
+              onChange={(event) => {
+                let to = parseInt(event.target.value, 10) + 3;
+                to = to < surah.ayat ? to : surah.ayat;
+                setRepeat({
+                  ...repeat,
+                  from: parseInt(event.target.value, 10),
+                  to
+                });
+              }}
             >
               {
-                array.map((ayah, index) => (
-                  <option key={index} value={index + 1}>
-                    {index + 1}
-                  </option>
-                ))
+                array.reduce((options, ayah, index) => {
+                  if (index + 1 < surah.ayat) { // Exclude last verse
+                    options.push(
+                      <option key={index} value={index + 1}>
+                        {index + 1}
+                      </option>
+                    );
+                  }
+                  return options;
+                }, [])
               }
             </FormControl>
           </li>
@@ -100,11 +109,16 @@ class RepeatButton extends Component {
               onChange={event => setRepeat({ ...repeat, to: parseInt(event.target.value, 10) })}
             >
               {
-                array.map((ayah, index) => (
-                  <option key={index} value={repeat.from ? index + 1 + repeat.from : index + 1}>
-                    {repeat.from ? index + 1 + repeat.from : index + 1}
-                  </option>
-                ))
+                array.reduce((options, ayah, index) => {
+                  if ((repeat.from ? repeat.from : 1) < index + 1 && index + 1 <= surah.ayat) {
+                    options.push(
+                      <option key={index} value={index + 1}>
+                        {index + 1}
+                      </option>
+                    );
+                  }
+                  return options;
+                }, [])
               }
             </FormControl>
           </li>