diff --git a/main/admin/session_add.php b/main/admin/session_add.php
index e843f7a39e..940f48865f 100755
--- a/main/admin/session_add.php
+++ b/main/admin/session_add.php
@@ -394,8 +394,8 @@ if ($form->validate()) {
     $coach_username = $params['coach_username'];
     $id_session_category = $params['session_category'];
     $id_visibility = $params['session_visibility'];
-    $end_limit = isset($params['end_limit']) ? true : false;
-    $start_limit = isset($params['start_limit']) ? true : false;
+    $end_limit = isset($params['end_limit']);
+    $start_limit = isset($params['start_limit']);
     $duration = isset($params['duration']) ? $params['duration'] : null;
     $description = $params['description'];
     $showDescription = isset($params['show_description']) ? 1: 0;
diff --git a/main/admin/session_edit.php b/main/admin/session_edit.php
index dfcafd080d..e3b68c15ae 100755
--- a/main/admin/session_edit.php
+++ b/main/admin/session_edit.php
@@ -295,8 +295,8 @@ if ($form->validate()) {
     $description = $params['description'];
     $showDescription = isset($params['show_description']) ? 1: 0;
 
-    $end_limit = $params['end_limit'];
-    $start_limit = $params['start_limit'];
+    $end_limit = isset($params['end_limit']);
+    $start_limit = isset($params['start_limit']);
 
     if (empty($end_limit) && empty($start_limit)) {
         $nolimit = 1;
diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 4c6733e443..9ee93b33a4 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -157,6 +157,8 @@ class SessionManager
         } elseif (!empty($start_limit) && !empty($end_limit) && empty($nolimit) && $date_start >= $date_end) {
             $msg = get_lang('StartDateShouldBeBeforeEndDate');
             return $msg;
+        } elseif (!empty($duration) && (!empty($start_limit) || !empty($end_limit))) {
+            return get_lang('ChooseEitherDurationOrTimeLimit');
         } else {
             $ready_to_create = false;
             if ($fix_name) {
@@ -1407,6 +1409,8 @@ class SessionManager
         } elseif (!empty($start_limit) && !empty($end_limit) && empty($nolimit) && $date_start >= $date_end) {
             $msg = get_lang('StartDateShouldBeBeforeEndDate');
             return $msg;
+        } elseif (!empty($duration) && (!empty($start_limit) || !empty($end_limit))) {
+            return get_lang('ChooseEitherDurationOrTimeLimit');
         } else {
 
             $rs = Database::query("SELECT id FROM $tbl_session WHERE name='" . Database::escape_string($name) . "'");