diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7a9d21871..6a763a0c3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -8,6 +8,7 @@ class ApplicationController < ActionController::Base
   before_action :authenticate_user!
   helper_method :current_organization
   before_action :generate_intro_tutorial, if: :is_current_page_root?
+  before_action :update_current_organization, if: :user_signed_in?
   around_action :set_time_zone, if: :current_user
   layout 'main'
 
@@ -81,6 +82,15 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def update_current_organization
+    if current_user.current_organization_id.blank? &&
+       current_user.organizations.count > 0
+      current_user.update(
+        current_organization_id: current_user.organizations.first.id
+      )
+    end
+  end
+
   # With this Devise callback user is redirected directly to sign in page instead
   # of to root path. Therefore notification for sign out is displayed.
   def after_sign_out_path_for(resource_or_scope)