diff --git a/controllers/my_tandems.php b/controllers/my_tandems.php
index 498c8d5d2edefd48fb63a1a30b47c3791433eeb7..b082554a7e4424d2494532205e5ee1cad6a361c4 100644
--- a/controllers/my_tandems.php
+++ b/controllers/my_tandems.php
@@ -224,7 +224,9 @@ class MyTandemsController extends PluginController
                         $new_language->language_id = $language_ids[$key];
                         $new_language->country = $countries[$key];
                         $new_language->region = $regions[$key];
-                        $new_language->level = $levels[$key];
+                        if (Config::get()->TANDEMPLUGIN_USE_LEVEL) {
+                            $new_language->level = $levels[$key];
+                        }
                         $new_language->store();
                         $processed_language_ids[] = $language_ids[$key];
                     }
@@ -249,7 +251,9 @@ class MyTandemsController extends PluginController
                                     $language->language_id = $language_ids[$key];
                                     $language->country = $countries[$key];
                                     $language->region = $regions[$key];
-                                    $language->level = $levels[$key];
+                                    if (Config::get()->TANDEMPLUGIN_USE_LEVEL) {
+                                        $language->level = $levels[$key];
+                                    }
                                     $language->store();
                                     $processed_language_ids[] = $language_ids[$key];
                                 }
diff --git a/plugin.manifest b/plugin.manifest
index eb530c723824ea683bfbc67aadd60474b1f54d44..10a6a483274d5c01bd384581427ace9c70d11c66 100644
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,7 +1,7 @@
 pluginname=TandemPlugin
 pluginclassname=TandemPlugin
 origin=data-quest
-version=1.5.3
+version=1.5.4
 description=Dieses Plugin ermöglicht es, Sprachtandems innerhalb der Stud.IP Platform zu bilden.
 studipMinVersion=5.0
 studipMaxVersion=5.9.99