diff --git a/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl b/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl
index 9c40cd4872..488b9d3b9c 100644
--- a/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl
+++ b/src/oc_erchef/apps/chef_license/src/chef_license_worker.erl
@@ -28,7 +28,7 @@
     message
 }).
 
--define(DEFAULT_LICENSE_SCAN_INTERVAL, 6 * 60 * 60 * 1000). %milli seconds
+-define(DEFAULT_LICENSE_SCAN_INTERVAL, 30000). %milli seconds
 
 -define(DEFAULT_FILE_PATH, "/tmp/lic").
 
@@ -95,6 +95,8 @@ check_license(State) ->
             State#state{license_cache=commercial_grace_period, grace_period=true, scanned_time = erlang:timestamp(), expiration_date=ExpDate, message=Msg};
         {ok, trial_expired, ExpDate, Msg} ->
             State#state{license_cache=trial_expired_expired, license_type = <<"trial">>, grace_period=undefined, scanned_time = erlang:timestamp(), expiration_date=ExpDate, message=Msg};
+        {error, no_license} ->
+            State#state{license_cache=trial_expired_expired, license_type = <<"trial">>, grace_period=undefined, scanned_time = erlang:timestamp(), expiration_date="", message=get_alert_message(trial_expired, "")};
         {error, _} -> State
     end.
 
@@ -133,6 +135,13 @@ process_license(LicJson) ->
                 _ ->
                     {error, invalid_response}
             end;
+        undefined ->
+            case ej:get({<<"status">>}, LicJson) of
+                <<"OK">> ->
+                    {error, no_license};
+                _ ->
+                    {error, invalid_response}
+            end;
         _ ->
             {error, invalid_response}
     end.