diff --git a/app/controllers/feedback_controller.rb b/app/controllers/feedback_controller.rb
index adb38645e..e5dc0f9bf 100644
--- a/app/controllers/feedback_controller.rb
+++ b/app/controllers/feedback_controller.rb
@@ -5,7 +5,6 @@ def index
     @form = FeedbackForm.new({})
     flash['feedback_referer'] = request.referer
     feedback_source = params['feedback-source'].nil? ? flash['feedback_source'] : params['feedback-source']
-    flash['feedback_source'] = feedback_source
     if feedback_source.nil?
       render
     elsif FEEDBACK_SOURCE_MAPPER.is_feedback_source_valid(feedback_source)
diff --git a/app/models/feedback_source_mapper.rb b/app/models/feedback_source_mapper.rb
index 579d547d7..11109e1aa 100644
--- a/app/models/feedback_source_mapper.rb
+++ b/app/models/feedback_source_mapper.rb
@@ -36,7 +36,7 @@ def initialize(product_page_url)
   end
 
   def is_feedback_source_valid(feedback_source)
-    @page_to_source_mappings[feedback_source].nil? ? false : true
+    @page_to_source_mappings.has_key?(feedback_source)
   end
 
   def page_from_source(feedback_source, locale)