diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js
index 8ed1cddb..d5861d8f 100644
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js
@@ -59,6 +59,7 @@ $(document).on('turbolinks:load', function(){
     $(".share-room").click(function() {
       // Update the path of save button
       $("#save-access").attr("data-path", $(this).data("path"))
+      $("#room-owner-uid").val($(this).data("owner"))
 
       // Get list of users shared with and display them
       displaySharedUsers($(this).data("users-path"))
@@ -82,7 +83,7 @@ $(document).on('turbolinks:load', function(){
         $(".bs-searchbox").siblings().hide()
       } else {
         // Manually populate the dropdown
-        $.get($("#share-room-select").data("path"), { search: $(".bs-searchbox input").val() }, function(users) {
+        $.get($("#share-room-select").data("path"), { search: $(".bs-searchbox input").val(), owner_uid: $("#room-owner-uid").val() }, function(users) {
           $(".select-options").remove()
           if (users.length > 0) {
             users.forEach(function(user) {
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 98db31e0..23afc65a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -209,7 +209,7 @@ class UsersController < ApplicationController
       roles_can_appear << role.name if role.get_permission("can_appear_in_share_list") && role.priority >= 0
     end
 
-    initial_list = User.where.not(uid: current_user.uid)
+    initial_list = User.where.not(uid: params[:owner_uid])
                        .with_role(roles_can_appear)
                        .shared_list_search(params[:search])
                        .pluck_to_hash(:uid, :name)
diff --git a/app/views/admins/components/_server_room_row.html.erb b/app/views/admins/components/_server_room_row.html.erb
index 683313c1..3c30d6cc 100644
--- a/app/views/admins/components/_server_room_row.html.erb
+++ b/app/views/admins/components/_server_room_row.html.erb
@@ -74,7 +74,7 @@
           </a>
         <% end %>
         <% if shared_access_allowed %>
-          <a href="" data-toggle="modal" data-target="#shareRoomModal" class="share-room dropdown-item" data-path="<%= room_shared_access_path(room) %>" data-users-path="<%= room_shared_users_path(room) %>">
+          <a href="" data-toggle="modal" data-target="#shareRoomModal" class="share-room dropdown-item" data-path="<%= room_shared_access_path(room) %>" data-users-path="<%= room_shared_users_path(room) %>" data-owner="<%= room.owner.uid %>">
             <i class="dropdown-icon fas fa-users"></i> <%= t("room.share") %>
           </a>
         <% end %>
diff --git a/app/views/rooms/components/_room_block.html.erb b/app/views/rooms/components/_room_block.html.erb
index f188a455..4b57db74 100644
--- a/app/views/rooms/components/_room_block.html.erb
+++ b/app/views/rooms/components/_room_block.html.erb
@@ -56,7 +56,7 @@
                 </a>
               <% end %>
               <% if shared_access_allowed %>
-                <a href="" data-toggle="modal" data-target="#shareRoomModal" class="share-room dropdown-item" data-path="<%= room_shared_access_path(room) %>" data-users-path="<%= room_shared_users_path(room) %>">
+                <a href="" data-toggle="modal" data-target="#shareRoomModal" class="share-room dropdown-item" data-path="<%= room_shared_access_path(room) %>" data-users-path="<%= room_shared_users_path(room) %>" data-owner="<%= room.owner.uid %>">
                   <i class="dropdown-icon fas fa-users"></i> <%= t("room.share") %>
                 </a>
               <% end %>
diff --git a/app/views/shared/modals/_share_room_modal.html.erb b/app/views/shared/modals/_share_room_modal.html.erb
index 5426b557..57a50c6d 100644
--- a/app/views/shared/modals/_share_room_modal.html.erb
+++ b/app/views/shared/modals/_share_room_modal.html.erb
@@ -28,6 +28,7 @@
             <ul id="user-list" class="list-group">
             </ul>
           </div>
+          <input id="room-owner-uid" type="hidden">
           <div class="mt-6">
             <button id="save-access" class="btn btn-primary btn-block" onclick="saveAccessChanges()" ><%= t("modal.share_access.save") %></button>
             <button class="btn btn-secondary text-primary btn-block" onclick="$('#shareRoomModal').modal('hide')"><%= t("modal.share_access.cancel_changes") %></button>