diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
index 405634ea..3d737b80 100644
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@@ -168,7 +168,9 @@ class RoomsController < ApplicationController
     }
 
     res = @room.update_recording(params[:record_id], meta)
-    redirect_to @room if res[:updated]
+
+    # Redirects to the page that made the initial request
+    redirect_to request.referrer if res[:updated]
   end
 
   # DELETE /:room_uid/:record_id
diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb
index c832e67f..0ac8980b 100644
--- a/app/views/rooms/show.html.erb
+++ b/app/views/rooms/show.html.erb
@@ -71,4 +71,4 @@
   </div>
 </div>
 
-<%= render "shared/sessions", recordings: @recordings, only_public: false %>
+<%= render "shared/sessions", recordings: @recordings, only_public: false, user_recordings: false %>
diff --git a/app/views/shared/_room_event.html.erb b/app/views/shared/_room_event.html.erb
index 2257ecfd..21a185a7 100644
--- a/app/views/shared/_room_event.html.erb
+++ b/app/views/shared/_room_event.html.erb
@@ -40,4 +40,4 @@
   </div>
 </div>
 
-<%= render "shared/sessions", recordings: @room.public_recordings, only_public: true %>
+<%= render "shared/sessions", recordings: @room.public_recordings, only_public: true, user_recordings: false %>
diff --git a/app/views/shared/_sessions.html.erb b/app/views/shared/_sessions.html.erb
index 138103aa..a195d985 100644
--- a/app/views/shared/_sessions.html.erb
+++ b/app/views/shared/_sessions.html.erb
@@ -50,7 +50,11 @@
                 <% if recordings.empty? %>
                   <tr>
                     <td colspan="7" class="text-center h4 p-6 font-weight-normal">
-                      <%= t("recording.no_recordings", inject: only_public ? t("recording.visibility.public").downcase + " "  : "") %>
+                      <% if user_recordings %>
+                        <%= t("recording.no_user_recordings") %>
+                      <% else %>
+                        <%= t("recording.no_recordings", inject: only_public ? t("recording.visibility.public").downcase + " "  : "") %>
+                      <% end %>
                     </td>
                   </tr>
                 <% else %>
diff --git a/app/views/users/recordings.html.erb b/app/views/users/recordings.html.erb
index f66442bd..0b8c1537 100644
--- a/app/views/users/recordings.html.erb
+++ b/app/views/users/recordings.html.erb
@@ -18,4 +18,4 @@
 # without losing all css
 %>
 
-<%= render "shared/sessions", recordings: @recordings, only_public: false %>
+<%= render "shared/sessions", recordings: @recordings, only_public: false, user_recordings: true %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bbc8a0d8..48bc9651 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -146,6 +146,7 @@ en:
   recording:
     email: Email Recording
     no_recordings: This room has no %{inject}recordings.
+    no_user_recordings: You currently have no recordings.
     no_matched_recordings: No %{inject} recordings match your search.
     recorded_on: Recorded on %{date}
     table: