diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAnnouncements.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAnnouncements.java
index fbeb125..3e54973 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAnnouncements.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAnnouncements.java
@@ -39,7 +39,7 @@ public class ModulesAnnouncements extends PartModules<ArrayList<Announcement>> {
             errorCallback.onError(new NetworkError(101204, 500, "Currently running in offline mode!"));
             return;
         }
-        super.get(String.format("https://kvv.imp.fu-berlin.de/direct/announcement/site/%s.json?n=999999&d=999999999", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
+        super.get(String.format("https://kvv.imp.fu-berlin.de/direct/announcement/site/%s.json?n=999999&d=999999999&_validateSession=", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
             String body = response.getParsed();
             if (body == null) {
                 errorCallback.onError(new NetworkError(101201, 403, "No announcements retrieved!"));
@@ -82,11 +82,7 @@ public class ModulesAnnouncements extends PartModules<ArrayList<Announcement>> {
                 }
             }
 
-            // Empty announcements *may be* because token is invalid -> check
-            if (announcements.size() == 0)
-                mLogin.testLoginToken(token -> callback.onResponse(announcements), errorCallback);
-            else
-                callback.onResponse(announcements);
+            callback.onResponse(announcements);
         }, error -> errorCallback.onError(new NetworkError(101203, error.networkResponse.statusCode, "Cannot get announcements!")));
     }
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAssignments.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAssignments.java
index b0230d3..6a9101a 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAssignments.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesAssignments.java
@@ -39,7 +39,7 @@ public class ModulesAssignments extends PartModules<AssignmentList> {
             errorCallback.onError(new NetworkError(101304, 500, "Currently running in offline mode!"));
             return;
         }
-        get(String.format("https://kvv.imp.fu-berlin.de/direct/assignment/site/%s.json", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
+        get(String.format("https://kvv.imp.fu-berlin.de/direct/assignment/site/%s.json?_validateSession=", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
             String body = response.getParsed();
             if (body == null) {
                 errorCallback.onError(new NetworkError(101301, 403, "No assignments retrieved!"));
@@ -80,11 +80,7 @@ public class ModulesAssignments extends PartModules<AssignmentList> {
                 }
             }
 
-            // Empty assignments *may be* because token is invalid -> check
-            if (assignments.size() == 0)
-                mLogin.testLoginToken(token -> callback.onResponse(assignments), errorCallback);
-            else
-                callback.onResponse(assignments);
+            callback.onResponse(assignments);
         }, error -> errorCallback.onError(new NetworkError(101303, error.networkResponse.statusCode, "Cannot get assignments!")));
     }
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java
index eee559b..60583f4 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesEvents.java
@@ -45,7 +45,7 @@ public class ModulesEvents extends PartModules<EventList> {
             errorCallback.onError(new NetworkError(101404, 500, "Currently running in offline mode!"));
             return;
         }
-        get(String.format("https://kvv.imp.fu-berlin.de/direct/calendar/site/%s.json?detailed=true", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
+        get(String.format("https://kvv.imp.fu-berlin.de/direct/calendar/site/%s.json?detailed=true&_validateSession=", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
             String body = response.getParsed();
             if (body == null) {
                 errorCallback.onError(new NetworkError(101401, 403, "No events retrieved!"));
@@ -81,11 +81,7 @@ public class ModulesEvents extends PartModules<EventList> {
                 }
             }
 
-            // Empty events *may be* because token is invalid -> check
-            if (events.size() == 0)
-                mLogin.testLoginToken(token -> callback.onResponse(events), errorCallback);
-            else
-                callback.onResponse(events);
+            callback.onResponse(events);
         }, error -> errorCallback.onError(new NetworkError(101403, error.networkResponse.statusCode, "Cannot get events!")));
     }
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java
index 09bd2fb..767cbc1 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java
@@ -175,7 +175,7 @@ public class ModulesList extends HTTPService {
             callback.onResponse(new Modules(mLogin.getLoginTokenKVV().getUsername()));
             return;
         }
-        get("https://kvv.imp.fu-berlin.de/direct/site.json", mLogin.getLoginTokenKVV().getCookies(), response -> {
+        get("https://kvv.imp.fu-berlin.de/direct/site.json?_validateSession=", mLogin.getLoginTokenKVV().getCookies(), response -> {
             String body = response.getParsed();
             if (body == null) {
                 errorCallback.onError(new NetworkError(101111, 403, "No module list retrieved!"));
@@ -228,11 +228,7 @@ public class ModulesList extends HTTPService {
                     e.printStackTrace();
                 }
             }
-            // Empty module *may be* because token is invalid -> check
-            if (modules.size() == 0)
-                mLogin.testLoginToken(token -> callback.onResponse(modules), errorCallback);
-            else
-                callback.onResponse(modules);
+            callback.onResponse(modules);
         }, error -> errorCallback.onError(new NetworkError(101115, error.networkResponse.statusCode, "Cannot get module list!")));
     }
 
diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesResources.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesResources.java
index c09413a..5e0ca60 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesResources.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesResources.java
@@ -47,7 +47,7 @@ public class ModulesResources extends PartModules<ArrayList<Resource>> {
             errorCallback.onError(new NetworkError(101604, 500, "Currently running in offline mode!"));
             return;
         }
-        get(String.format("https://kvv.imp.fu-berlin.de/direct/content/site/%s.json", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
+        get(String.format("https://kvv.imp.fu-berlin.de/direct/content/site/%s.json?_validateSession=", ID), mLogin.getLoginTokenKVV().getCookies(), response -> {
             String body = response.getParsed();
             if (body == null) {
                 errorCallback.onError(new NetworkError(101601, 403, "No resources retrieved!"));
@@ -116,11 +116,7 @@ public class ModulesResources extends PartModules<ArrayList<Resource>> {
                 }
             }
 
-            // Empty resources *may be* because token is invalid -> check
-            if (resources.size() == 0)
-                mLogin.testLoginToken(token -> callback.onResponse(root), errorCallback);
-            else
-                callback.onResponse(root);
+            callback.onResponse(root);
         }, error -> errorCallback.onError(new NetworkError(101603, error.networkResponse.statusCode, "Cannot get resources!")));
     }