diff --git a/protected/humhub/components/bootstrap/LanguageSelector.php b/protected/humhub/components/bootstrap/LanguageSelector.php
index df0384d809..33145754ac 100644
--- a/protected/humhub/components/bootstrap/LanguageSelector.php
+++ b/protected/humhub/components/bootstrap/LanguageSelector.php
@@ -67,8 +67,9 @@ class LanguageSelector implements BootstrapInterface
             if ($app->user->language) {
                 $app->language = $app->user->language;
             }
-            
-            $app->formatter->timeZone = $app->user->timeZone;
+            if ($app->user->timeZone) {
+                $app->formatter->timeZone = $app->user->timeZone;
+            }
             $app->formatter->defaultTimeZone = $app->timeZone;
         }