From 3a5238f6f35c50da0aefd44b66dd82c5f16e4d19 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Mon, 20 Aug 2018 14:26:42 +0200
Subject: [PATCH] Fix error on activities page when user doesn't have any
 [SCI-2628]

---
 app/controllers/activities_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index fe43522a3..792b5e2cf 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -23,7 +23,7 @@ class ActivitiesController < ApplicationController
     activities = current_user.last_activities
                              .page(page)
                              .per(Constants::ACTIVITY_AND_NOTIF_SEARCH_LIMIT)
-    unless activities.last_page?
+    unless activities.blank? || activities.last_page?
       more_url = url_for(
         activities_url(
           format: :json,