diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py
index 114e74b5..e609a336 100644
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@@ -108,7 +108,7 @@ class DownloadUtils(object):
                 "GoToSettings,PageDown,PreviousLetter,TakeScreenshot,"
                 "VolumeUp,VolumeDown,ToggleMute,SendString,DisplayMessage,"
                 "SetAudioStreamIndex,SetSubtitleStreamIndex,"
-
+                "SetRepeatMode,"
                 "Mute,Unmute,SetVolume,"
                 "Play,Playstate,PlayNext"
             )
diff --git a/resources/lib/websocket_client.py b/resources/lib/websocket_client.py
index f41888a2..8805794e 100644
--- a/resources/lib/websocket_client.py
+++ b/resources/lib/websocket_client.py
@@ -188,7 +188,7 @@ class WebSocketClient(threading.Thread):
         arguments = data['Arguments']
 
         if command in ('Mute', 'Unmute', 'SetVolume',
-                       'SetSubtitleStreamIndex', 'SetAudioStreamIndex'):
+                       'SetSubtitleStreamIndex', 'SetAudioStreamIndex', 'SetRepeatMode'):
 
             player = xbmc.Player()
             # These commands need to be reported back
@@ -206,6 +206,10 @@ class WebSocketClient(threading.Thread):
                 index = int(arguments['Index'])
                 player.setAudioStream(index - 1)
 
+            elif command == 'SetRepeatMode':
+                mode = arguments['RepeatMode']
+                xbmc.executebuiltin('xbmc.PlayerControl(%s)' % mode)
+
             elif command == 'SetSubtitleStreamIndex':
                 emby_index = int(arguments['Index'])
                 current_file = player.getPlayingFile()