diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 152c8571..830fb1be 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,8 +21,11 @@
       </span>
       <span class="signup pull-right">
         <% if current_user %>
-          <%= current_user.name %> |
-          <%= link_to t('my_room'), current_user.room_url %> |
+          <% if !@user %>
+            <%= link_to current_user.name, current_user.room_url %> |
+          <% else %>
+            <%= current_user.name %> |
+          <% end %>
           <%= link_to t('logout'), user_logout_url %>
         <% elsif @user %>
           <%= t('are_you', name: @user.username) %> |