diff --git a/web/app/controllers/api_music_sessions_controller.rb b/web/app/controllers/api_music_sessions_controller.rb
index 1d1028a8b..9809d49d0 100644
--- a/web/app/controllers/api_music_sessions_controller.rb
+++ b/web/app/controllers/api_music_sessions_controller.rb
@@ -101,11 +101,11 @@ class ApiMusicSessionsController < ApiController
 
   def participant_delete
     client_id = params[:id]
-    @connection = Connection.find_by_client_id!(client_id)
-    music_session = MusicSession.find(@connection.music_session_id)
-
-    MusicSessionManager.new.participant_delete(current_user, @connection, music_session)
-
+    if client_id.present? && client_id != 'undefined'
+      @connection = Connection.find_by_client_id!(client_id)
+      music_session = MusicSession.find(@connection.music_session_id)
+      MusicSessionManager.new.participant_delete(current_user, @connection, music_session)
+    end
     respond_with @connection, responder: ApiResponder
   end