diff --git a/lang/1.php b/lang/1.php
index 758bd92ad..32c97493c 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2431,6 +2431,7 @@ $lang = array (
     "srv_call_nonumbers"					=>	 "Ni več številk v bazi!",
     "srv_call_nonumbers_time"				=>	 "Naslednji klic mogoč ob:",
     "srv_call"								=>	 "Klic",
+    "srv_survey_repsonse_limit"   			=>	 "Anketa ima preseženo število odgvorov.",
     "srv_survey_non_active"        			=>	 "Anketa je zaključena.",
     "srv_survey_non_active1"        			=>	 "Anketa je zaključena.",
     "srv_survey_deleted"        			=>	 "Anketa je izbrisana.",
diff --git a/lang/2.php b/lang/2.php
index 16793ae04..29df4ffbe 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2412,8 +2412,9 @@ $lang = array (
     "srv_call_nonumbers"    =>  "There is no more phone numbers in the database!",
 	"srv_call_nonumbers_time"	=>	 "Next call possible:",
     "srv_call"              =>  "Call",
-    "srv_survey_non_active" =>  "Survey is closed.",
-    "srv_survey_deleted"    =>	"Survey was deleted.",
+    "srv_survey_repsonse_limit"   			=>	"Survey has exceeded response limit.",
+    "srv_survey_non_active"                 =>  "Survey is closed.",
+    "srv_survey_deleted"                    =>	"Survey was deleted.",
 	"srv_survey_non_active_notActivated"    =>	"Survey was not activated yet.",
 	"srv_survey_non_active_notActivated1"   =>	"Survey was not activated yet.",
     "srv_survey_non_active_notStarted"	    =>  "Survey is not active. Survey starts on: ",
diff --git a/main/survey/app/Controllers/InitClass.php b/main/survey/app/Controllers/InitClass.php
index a3913fdf2..b5ef3f819 100644
--- a/main/survey/app/Controllers/InitClass.php
+++ b/main/survey/app/Controllers/InitClass.php
@@ -24,6 +24,7 @@ use SurveySlideshow;
 use GDPR;
 use MAZA;
 use UserAccess;
+use SurveyCheck;
 
 
 class InitClass extends Controller
@@ -302,13 +303,10 @@ class InitClass extends Controller
                         $this->set_userstatus(6);
 
                         Body::getInstance()->displayKonec();
-
                     } 
                     elseif (get('displayAllPages')) {
 
-                        Body::getInstance()->displayAllPages();
-
-                        
+                        Body::getInstance()->displayAllPages();       
                     } 
                     // prikazemo ustrezno stran / grupo
                     elseif (get('grupa') > 0) {
@@ -966,6 +964,13 @@ class InitClass extends Controller
         // drugace gremo kreirat nov cookie
         if (get('usr_id') == null) {
 
+            // Najprej preverimo limit responsov na anketi - zaenkrat ne naredimo nic, samo posljemo mail ko je limit dosezen
+            $check = new SurveyCheck(get('anketa'));
+            if($check->checkLimitResponses()){
+                /*Display::getInstance()->displayNapaka(self::$lang['srv_survey_repsonse_limit']);
+                die();*/
+            }
+
             // izberemo random hash, ki se ni v bazi
             do {
                 $rand = md5(mt_rand(1, mt_getrandmax()) . '@' . Helper::remote_address());