diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index 921fcf4049..0b73c5a124 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -559,6 +559,7 @@ Metrics/CyclomaticComplexity:
   - app/helpers/checkout_helper.rb
   - app/helpers/i18n_helper.rb
   - app/helpers/order_cycles_helper.rb
+  - app/helpers/spree/admin/navigation_helper_decorator.rb
   - app/models/enterprise.rb
   - app/models/enterprise_relationship.rb
   - app/models/product_import/entry_processor.rb
diff --git a/app/helpers/spree/admin/navigation_helper_decorator.rb b/app/helpers/spree/admin/navigation_helper_decorator.rb
index eabf26e5e3..aa0a9324df 100644
--- a/app/helpers/spree/admin/navigation_helper_decorator.rb
+++ b/app/helpers/spree/admin/navigation_helper_decorator.rb
@@ -18,6 +18,7 @@ module Spree
         klass = Spree::Order if klass == :bulk_order_management
         klass = EnterpriseGroup if klass == :group
         klass = VariantOverride if klass == :Inventory
+        klass = ProductImport::ProductImporter if klass == :import
         klass = Spree::Admin::ReportsController if klass == :report
         klass
       end
diff --git a/app/models/feature_flags.rb b/app/models/feature_flags.rb
deleted file mode 100644
index 4354e0c414..0000000000
--- a/app/models/feature_flags.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Tells whether a particular feature is enabled or not
-class FeatureFlags
-  # Constructor
-  #
-  # @param user [User]
-  def initialize(user)
-    @user = user
-  end
-
-  # Checks whether product import is enabled for the specified user
-  #
-  # @return [Boolean]
-  def product_import_enabled?
-    user.superadmin?
-  end
-
-  private
-
-  attr_reader :user
-end
diff --git a/app/views/admin/product_import/index.html.haml b/app/views/admin/product_import/index.html.haml
index 77de45acc9..5f9a66f4fe 100644
--- a/app/views/admin/product_import/index.html.haml
+++ b/app/views/admin/product_import/index.html.haml
@@ -5,4 +5,11 @@
 
 = render 'upload_sidebar'
 
+%h5
+  = t('.notice')
+%br
+%p
+  = t('.beta_notice')
+%br
+
 = render 'upload_form'
diff --git a/app/views/spree/admin/products/index/_filters.html.haml b/app/views/spree/admin/products/index/_filters.html.haml
index 9c08c9adda..72458b3391 100644
--- a/app/views/spree/admin/products/index/_filters.html.haml
+++ b/app/views/spree/admin/products/index/_filters.html.haml
@@ -12,13 +12,12 @@
     %label{ for: 'category_filter' }= t 'category'
     %br
     %select.fullwidth{ id: 'category_filter', 'ofn-select2-min-search' => 5, ng: {model: 'categoryFilter', options: 'taxon.id as taxon.name for taxon in filterTaxons'} }
-  - if FeatureFlags.new(@current_user).product_import_enabled?
-    .filter_select.three.columns
-      %label{ for: 'import_filter' } Import Date
-      %br
-      %select.fullwidth{ id: 'import_date_filter', 'ofn-select2-min-search' => 5, ng: {model: 'importDateFilter', init: "importDates = #{@import_dates}; showLatestImport = #{@show_latest_import}"}}
-        %option{value: "{{date.id}}", ng: {repeat: "date in importDates track by date.id" }}
-          {{date.name}}
+  .filter_select.three.columns
+    %label{ for: 'import_filter' } Import Date
+    %br
+    %select.fullwidth{ id: 'import_date_filter', 'ofn-select2-min-search' => 5, ng: {model: 'importDateFilter', init: "importDates = #{@import_dates}; showLatestImport = #{@show_latest_import}"}}
+      %option{value: "{{date.id}}", ng: {repeat: "date in importDates track by date.id" }}
+        {{date.name}}
 
   .filter_clear.three.columns.omega
     %label{ for: 'clear_all_filters' }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 491d74caba..4db2a0d477 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -507,6 +507,8 @@ en:
         encoding_error: "Please check the language setting of your source file and ensure it is saved with UTF-8 encoding"
         unexpected_error: "Product Import encountered an unexpected error whilst opening the file: %{error_message}"
       index:
+        notice: "Notice"
+        beta_notice: "This feature is still in beta: you may experience some errors while using it. Please don't hesitate to contact support."
         select_file: Select a spreadsheet to upload
         spreadsheet: Spreadsheet
         choose_import_type: Select import type
diff --git a/spec/models/feature_flags_spec.rb b/spec/models/feature_flags_spec.rb
deleted file mode 100644
index a14bb4f01f..0000000000
--- a/spec/models/feature_flags_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe FeatureFlags do
-  let(:user) { build_stubbed(:user) }
-  let(:feature_flags) { described_class.new(user) }
-
-  describe '#product_import_enabled?' do
-    context 'when the user is superadmin' do
-      before do
-        allow(user).to receive(:superadmin?) { true }
-      end
-
-      it 'returns true' do
-        expect(feature_flags.product_import_enabled?).to eq(true)
-      end
-    end
-
-    context 'when the user is not superadmin' do
-      before do
-        allow(user).to receive(:superadmin?) { false }
-      end
-
-      it 'returns false' do
-        expect(feature_flags.product_import_enabled?).to eq(false)
-      end
-    end
-  end
-end