diff --git a/app/models/spree/tracker.rb b/app/models/spree/tracker.rb
index 837f4ef..9509e1e 100644
--- a/app/models/spree/tracker.rb
+++ b/app/models/spree/tracker.rb
@@ -23,7 +23,7 @@ class << self
     deprecate current_tracker: :current, deprecator: Spree::Deprecation
   end
 
-  def self.by_type(store: Spree::Store.default, type: 'google_analytics')
+  def self.by_type(store = nil, type = 'google_analytics')
     return if !store
 
     Spree::Tracker.where(active: true,
diff --git a/app/views/spree/shared/_google_analytics.html.erb b/app/views/spree/shared/_google_analytics.html.erb
index c2e9934..472ffb2 100644
--- a/app/views/spree/shared/_google_analytics.html.erb
+++ b/app/views/spree/shared/_google_analytics.html.erb
@@ -1,4 +1,4 @@
-<% tracker = Spree::Tracker.by_type(store: Spree::Store.default, type: 'google_analytics') %>
+<% tracker = Spree::Tracker.by_type(current_store, 'google_analytics') %>
 
 <% if tracker %>
   <script id='solidus_trackers_google_analytics'>
diff --git a/app/views/spree/shared/_google_manager.html.erb b/app/views/spree/shared/_google_manager.html.erb
index d9c466c..08a9d88 100644
--- a/app/views/spree/shared/_google_manager.html.erb
+++ b/app/views/spree/shared/_google_manager.html.erb
@@ -1,4 +1,4 @@
-<% tracker = Spree::Tracker.by_type(store: Spree::Store.default, type: 'google_manager') %>
+<% tracker = Spree::Tracker.by_type(current_store, 'google_manager') %>
 
 <% if tracker %>
   <script id='solidus_trackers_google_manager'>
diff --git a/spec/models/spree/tracker_spec.rb b/spec/models/spree/tracker_spec.rb
index cc11ebf..86a30dd 100644
--- a/spec/models/spree/tracker_spec.rb
+++ b/spec/models/spree/tracker_spec.rb
@@ -41,24 +41,21 @@
 
   describe "by_type" do
     it "returns nil if no store passed in argument" do
-      expect(Spree::Tracker.by_type(store: nil, type: nil)).to eq(nil)
+      expect(Spree::Tracker.by_type).to eq(nil)
     end
 
     it "returns the first active tracker" do
-      expect(Spree::Tracker.by_type(store: store,
-                                    type: tracker.tracker_type)).to eq(tracker)
+      expect(Spree::Tracker.by_type(store, tracker.tracker_type)).to eq(tracker)
     end
 
     it "does not return an inactive tracker" do
       tracker.update_attribute(:active, false)
-      expect(Spree::Tracker.by_type(store: store,
-                                    type: tracker.tracker_type)).to eq(nil)
+      expect(Spree::Tracker.by_type(store, tracker.tracker_type)).to eq(nil)
     end
 
     it "finds tracker by store" do
       tracker.update_attribute(:tracker_type, 'google_analytics')
-      expect(Spree::Tracker.by_type(store: store,
-                                    type: tracker.tracker_type)).to eq(tracker)
+      expect(Spree::Tracker.by_type(store, tracker.tracker_type)).to eq(tracker)
     end
   end
 end