diff --git a/JellyfinPlayer tvOS/Views/VideoPlayer/tvOSOverlay/tvOSOverlayContent.swift b/JellyfinPlayer tvOS/Views/VideoPlayer/tvOSOverlay/tvOSOverlayContent.swift
index 0558eb28..cda78ad1 100644
--- a/JellyfinPlayer tvOS/Views/VideoPlayer/tvOSOverlay/tvOSOverlayContent.swift	
+++ b/JellyfinPlayer tvOS/Views/VideoPlayer/tvOSOverlay/tvOSOverlayContent.swift	
@@ -75,7 +75,7 @@ struct tvOSOverlayContentView_Previews: PreviewProvider {
                                                     overlayType: .compact,
                                                     shouldShowPlayPreviousItem: true,
                                                     shouldShowPlayNextItem: true,
-                                                    shouldShowAutoPlayNextItem: true)
+                                                    shouldShowAutoPlay: true)
     
     static var previews: some View {
         ZStack {
diff --git a/JellyfinPlayer tvOS/Views/VideoPlayer/tvOSOverlay/tvOSVLCOverlay.swift b/JellyfinPlayer tvOS/Views/VideoPlayer/tvOSOverlay/tvOSVLCOverlay.swift
index 9fab7783..67d1cec5 100644
--- a/JellyfinPlayer tvOS/Views/VideoPlayer/tvOSOverlay/tvOSVLCOverlay.swift	
+++ b/JellyfinPlayer tvOS/Views/VideoPlayer/tvOSOverlay/tvOSVLCOverlay.swift	
@@ -55,7 +55,6 @@ struct tvOSVLCOverlay: View {
 
                     Spacer()
                     
-                    
                     if viewModel.shouldShowPlayPreviousItem {
                         SFSymbolButton(systemName: "chevron.left.circle", action: {
                             viewModel.playerOverlayDelegate?.didSelectPlayPreviousItem()
@@ -74,6 +73,18 @@ struct tvOSVLCOverlay: View {
                         .foregroundColor(viewModel.nextItemVideoPlayerViewModel == nil ? .gray : .white)
                     }
                     
+                    if viewModel.shouldShowAutoPlay {
+                        Button {
+                            viewModel.autoplayEnabled.toggle()
+                        } label: {
+                            if viewModel.autoplayEnabled {
+                                Image(systemName: "play.circle.fill")
+                            } else {
+                                Image(systemName: "stop.circle")
+                            }
+                        }
+                    }
+                    
                     if !viewModel.subtitleStreams.isEmpty {
                         if viewModel.subtitlesEnabled {
                             SFSymbolButton(systemName: "captions.bubble.fill") {
@@ -140,7 +151,7 @@ struct tvOSVLCOverlay_Previews: PreviewProvider {
                                                     overlayType: .compact,
                                                     shouldShowPlayPreviousItem: true,
                                                     shouldShowPlayNextItem: true,
-                                                    shouldShowAutoPlayNextItem: true)
+                                                    shouldShowAutoPlay: true)
     
     static var previews: some View {
         ZStack {
diff --git a/JellyfinPlayer/Views/VideoPlayer/VLCPlayerOverlayView.swift b/JellyfinPlayer/Views/VideoPlayer/VLCPlayerOverlayView.swift
index 5972123d..c73e3ee2 100644
--- a/JellyfinPlayer/Views/VideoPlayer/VLCPlayerOverlayView.swift
+++ b/JellyfinPlayer/Views/VideoPlayer/VLCPlayerOverlayView.swift
@@ -88,7 +88,7 @@ struct VLCPlayerOverlayView: View {
                                 .foregroundColor(viewModel.nextItemVideoPlayerViewModel == nil ? .gray : .white)
                             }
                             
-                            if viewModel.shouldShowAutoPlayNextItem {
+                            if viewModel.shouldShowAutoPlay {
                                 Button {
                                     viewModel.autoplayEnabled.toggle()
                                 } label: {
@@ -337,7 +337,7 @@ struct VLCPlayerCompactOverlayView_Previews: PreviewProvider {
                                                     overlayType: .compact,
                                                     shouldShowPlayPreviousItem: true,
                                                     shouldShowPlayNextItem: true,
-                                                    shouldShowAutoPlayNextItem: true)
+                                                    shouldShowAutoPlay: true)
     
     static var previews: some View {
         ZStack {
diff --git a/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift b/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift
index bbed415e..c0214167 100644
--- a/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift
+++ b/Shared/Extensions/JellyfinAPIExtensions/BaseItemDto+VideoPlayerViewModel.swift
@@ -116,7 +116,7 @@ extension BaseItemDto {
                                                                 overlayType: overlayType,
                                                                 shouldShowPlayPreviousItem: shouldShowPlayPreviousItem,
                                                                 shouldShowPlayNextItem: shouldShowPlayNextItem,
-                                                                shouldShowAutoPlayNextItem: shouldShowAutoPlay)
+                                                                shouldShowAutoPlay: shouldShowAutoPlay)
                 
                 return videoPlayerViewModel
             })
diff --git a/Shared/ViewModels/VideoPlayerViewModel.swift b/Shared/ViewModels/VideoPlayerViewModel.swift
index 79ec3195..ac86a054 100644
--- a/Shared/ViewModels/VideoPlayerViewModel.swift
+++ b/Shared/ViewModels/VideoPlayerViewModel.swift
@@ -53,7 +53,7 @@ final class VideoPlayerViewModel: ViewModel {
     
     let shouldShowPlayPreviousItem: Bool
     let shouldShowPlayNextItem: Bool
-    let shouldShowAutoPlayNextItem: Bool
+    let shouldShowAutoPlay: Bool
     
     // MARK: General
     let item: BaseItemDto
@@ -104,9 +104,7 @@ final class VideoPlayerViewModel: ViewModel {
          overlayType: OverlayType,
          shouldShowPlayPreviousItem: Bool,
          shouldShowPlayNextItem: Bool,
-         shouldShowAutoPlayNextItem: Bool
-         
-         ) {
+         shouldShowAutoPlay: Bool) {
         self.item = item
         self.title = title
         self.subtitle = subtitle
@@ -122,7 +120,7 @@ final class VideoPlayerViewModel: ViewModel {
         self.overlayType = overlayType
         self.shouldShowPlayPreviousItem = shouldShowPlayPreviousItem
         self.shouldShowPlayNextItem = shouldShowPlayNextItem
-        self.shouldShowAutoPlayNextItem = shouldShowAutoPlayNextItem
+        self.shouldShowAutoPlay = shouldShowAutoPlay
         
         self.jumpBackwardLength = Defaults[.videoPlayerJumpBackward]
         self.jumpForwardLength = Defaults[.videoPlayerJumpForward]