diff --git a/.gitignore b/.gitignore
index dc6a5a9..e1392b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+.DS_Store
\ No newline at end of file
diff --git a/config/initializers/demo.rb b/config/initializers/demo.rb
index de6fb3b..857dc99 100644
--- a/config/initializers/demo.rb
+++ b/config/initializers/demo.rb
@@ -1,5 +1,10 @@
 # frozen_string_literal: true
+if ENV['GOOGLE_DEMO_FORM_ID'].present?
+  GOOGLE_DEMO_FORM = Form.find_by(id: ENV['GOOGLE_DEMO_FORM_ID'])
+end
+
+if ENV['AIRTABLE_DEMO_FORM_ID'].present?
+  AIRTABLE_DEMO_FORM = Form.find_by(id: ENV['AIRTABLE_DEMO_FORM_ID'])
+end
 
-GOOGLE_DEMO_FORM = Form.find_by(id: ENV['GOOGLE_DEMO_FORM_ID'])
-AIRTABLE_DEMO_FORM = Form.find_by(id: ENV['AIRTABLE_DEMO_FORM_ID'])
 AIRTABLE_DEMO_EMBED_URL = ENV['AIRTABLE_DEMO_EMBED_URL']