diff --git a/src/oc-id/Gemfile b/src/oc-id/Gemfile
index 748eeda24c..ff063b944a 100644
--- a/src/oc-id/Gemfile
+++ b/src/oc-id/Gemfile
@@ -13,6 +13,7 @@ gem 'rb-readline', '~> 0.5.2', require: false
 gem 'sass-rails', '>= 4.0.3'
 gem 'turbolinks', '~> 5'
 gem 'nokogiri', '1.18.9', platforms: :ruby # Force Ruby platform to avoid glibc compatibility issues
+gem 'public_suffix', '< 7.0' # public_suffix 7.0+ requires Ruby >= 3.2; pin for Ruby 3.1 compatibility
 gem 'pg', '>= 0.18', '< 1.6' # active_record 4.2.8 pins this but doesn't manifest this in the gemspec for some reason
 
 gem 'unicorn-rails',
diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock
index 2ad3b41e1a..ac5614ad36 100644
--- a/src/oc-id/Gemfile.lock
+++ b/src/oc-id/Gemfile.lock
@@ -117,8 +117,8 @@ GEM
       mutex_m
       securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     aws-eventstream (1.4.0)
     aws-partitions (1.1246.0)
@@ -518,7 +518,7 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.2)
+    public_suffix (6.0.1)
     racc (1.8.1)
     rack (3.2.6)
     rack-protection (4.2.1)
@@ -777,6 +777,7 @@ DEPENDENCIES
   nokogiri (= 1.18.9)
   omniauth-chef (~> 0.4.1)!
   pg (>= 0.18, < 1.6)
+  public_suffix (< 7.0)
   pry-byebug
   rack (>= 3.2.4)
   rails (= 7.1.5.2)
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 d373bc6fe5..ac1eb5ba73 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
@@ -107,8 +107,8 @@ install_time() ->
       catch error:badarg ->
         DefaultTime
       end;
-    not_found -> {ok, 0};
-    {error, Reason} -> {error, Reason}
+    not_found -> DefaultTime;
+    {error, _Reason} -> DefaultTime
   end.
 
 % This will continue to be the default behavior - license will only be checked