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 bfc2106..b0230d3 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
@@ -35,7 +35,7 @@ public class ModulesAssignments extends PartModules<AssignmentList> {
 
     @Override
     protected void upgradeKVV(final String ID, final NetworkCallback<AssignmentList> callback, final NetworkErrorCallback errorCallback) {
-        if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenKVV() == null) {
+        if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenKVV() == null || !mLogin.getLoginTokenKVV().isAvailable()) {
             errorCallback.onError(new NetworkError(101304, 500, "Currently running in offline mode!"));
             return;
         }
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 e6fa177..8e1a6b0 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
@@ -33,7 +33,7 @@ public class ModulesEvents extends PartModules<EventList> {
 
     @Override
     protected void upgradeKVV(final String ID, final NetworkCallback<EventList> callback, final NetworkErrorCallback errorCallback) {
-        if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenKVV() == null) {
+        if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenKVV() == null || !mLogin.getLoginTokenKVV().isAvailable()) {
             errorCallback.onError(new NetworkError(101404, 500, "Currently running in offline mode!"));
             return;
         }
diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesGradebook.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesGradebook.java
index 781ab42..b2fd9a3 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesGradebook.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesGradebook.java
@@ -34,7 +34,7 @@ public class ModulesGradebook extends PartModules<ArrayList<Grade>> {
 
     @Override
     protected void upgradeKVV(final String ID, final NetworkCallback<ArrayList<Grade>> callback, final NetworkErrorCallback errorCallback) {
-        if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenKVV() == null) {
+        if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenKVV() == null || !mLogin.getLoginTokenKVV().isAvailable()) {
             errorCallback.onError(new NetworkError(101504, 500, "Currently running in offline mode!"));
             return;
         }
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 eede02d..990622f 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
@@ -43,7 +43,7 @@ public class ModulesResources extends PartModules<ArrayList<Resource>> {
 
     @Override
     protected void upgradeKVV(final String ID, final NetworkCallback<ArrayList<Resource>> callback, final NetworkErrorCallback errorCallback) {
-        if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenKVV() == null) {
+        if (!mLogin.isInOnlineMode() || mLogin.getLoginTokenKVV() == null || !mLogin.getLoginTokenKVV().isAvailable()) {
             errorCallback.onError(new NetworkError(101604, 500, "Currently running in offline mode!"));
             return;
         }