diff --git a/library/src/androidTest/java/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationIT.kt b/library/src/androidTest/java/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationIT.kt
index 0b1be62453..9d8a0215d5 100644
--- a/library/src/androidTest/java/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationIT.kt
+++ b/library/src/androidTest/java/com/nextcloud/lib/resources/users/GetActivitiesRemoteOperationIT.kt
@@ -9,7 +9,6 @@ package com.nextcloud.lib.resources.users
 
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.lib.resources.activities.GetActivitiesRemoteOperation
-import com.owncloud.android.lib.resources.activities.model.Activity
 import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation
 import org.junit.Assert.assertTrue
 import org.junit.Test
@@ -23,8 +22,8 @@ class GetActivitiesRemoteOperationIT : AbstractIT() {
         val result = nextcloudClient.execute(GetActivitiesRemoteOperation())
         assertTrue(result.isSuccess)
 
-        val activities = result.data[0] as ArrayList<Activity>
-        val lastGiven = result.data[1] as Integer
+        val activities = result.data[0] as ArrayList<*>
+        val lastGiven = result.data[1] as Long
 
         assertTrue(activities.isNotEmpty())
         assertTrue(lastGiven > 0)
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java
index 423126dbdb..bbc81109a2 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/activities/GetActivitiesRemoteOperation.java
@@ -54,7 +54,7 @@ public class GetActivitiesRemoteOperation extends RemoteOperation {
 
     private static final String NODE_DATA = "data";
 
-    private int lastGiven = -1;
+    private long lastGiven = -1;
     
     private long fileId = -1;
 
@@ -65,7 +65,7 @@ public GetActivitiesRemoteOperation(long fileId) {
         this.fileId = fileId;
     }
 
-    public GetActivitiesRemoteOperation(long fileId, int lastGiven) {
+    public GetActivitiesRemoteOperation(long fileId, long lastGiven) {
         this.fileId = fileId;
         this.lastGiven = lastGiven;
     }
@@ -114,7 +114,7 @@ public RemoteOperationResult run(NextcloudClient client) {
             if (isSuccess(status)) {
                 String nextPageHeader = get.getResponseHeader("X-Activity-Last-Given");
                 if (nextPageHeader != null) {
-                    lastGiven = Integer.parseInt(nextPageHeader);
+                    lastGiven = Long.parseLong(nextPageHeader);
                 } else {
                     lastGiven = -1;
                 }
@@ -185,7 +185,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
 
             Header nextPageHeader = get.getResponseHeader("X-Activity-Last-Given");
             if (nextPageHeader != null) {
-                lastGiven = Integer.parseInt(nextPageHeader.getValue());
+                lastGiven = Long.parseLong(nextPageHeader.getValue());
             } else {
                 lastGiven = -1;
             }