diff --git a/app/controllers/audio_events_controller.rb b/app/controllers/audio_events_controller.rb
index e7347e14..8ee47f5f 100644
--- a/app/controllers/audio_events_controller.rb
+++ b/app/controllers/audio_events_controller.rb
@@ -20,8 +20,14 @@ def by_audio_id
 
     # HACK: inefficient
 
-    @audio_recording  = (AudioRecording.find_by_uuid id)
-    @audio_events = AudioEvent.find_all_by_audio_recording_id  @audio_recording.id
+    #@audio_recording  = (AudioRecording.find_by_uuid id)
+    #@audio_events = AudioEvent.find_all_by_audio_recording_id  @audio_recording.id
+
+    @audio_events =
+        (AudioRecording)
+        .select([:id, :uuid])
+        .joins(:@audio_events)
+        .where(:audio_recordings => {:uuid => id})
 
     respond_to do |format|
       format.json { render json: @audio_events}