diff --git a/app/models/bulletin_feed.rb b/app/models/bulletin_feed.rb
index 6a60d28..4ed8c7a 100644
--- a/app/models/bulletin_feed.rb
+++ b/app/models/bulletin_feed.rb
@@ -29,19 +29,23 @@ class BulletinFeed
     end
   end
   def generate_one_cache_timeout(startdt: nil,enddt: nil,dt: nil, base_url: nil, timeout: nil)
-    timeout = 100000 if timeout.nil?
     begin
-      Timeout::timeout(timeout) {
-        feed_cache = nil
-        Thread.new do
-          feed_cache = self.generate_one_cache(startdt: startdt,enddt: enddt,dt: dt,base_url: base_url)
-        end
-        (1..(timeout.to_i+1)).each do
-          sleep(1)
-          break if !feed_cache.nil?
-        end
+      if timeout.nil?
+        feed_cache = self.generate_one_cache(startdt: startdt,enddt: enddt,dt: dt,base_url: base_url)
         feed_cache.content
-      }
+      else
+        Timeout::timeout(timeout) {
+          feed_cache = nil
+          Thread.new do
+            feed_cache = self.generate_one_cache(startdt: startdt,enddt: enddt,dt: dt,base_url: base_url)
+          end
+          (1..(timeout.to_i+1)).each do
+            sleep(1)
+            break if !feed_cache.nil?
+          end
+          feed_cache.content
+        }
+      end
     rescue=> e
       puts [e,e.backtrace]
       ""