diff --git a/app/models/direct_message.rb b/app/models/direct_message.rb
index 4f3b08482..442d56534 100644
--- a/app/models/direct_message.rb
+++ b/app/models/direct_message.rb
@@ -8,7 +8,7 @@ class DirectMessage < ApplicationRecord
   validates :receiver, presence: true
   validate  :max_per_day
 
-  scope :today, lambda { where("DATE(created_at) = DATE(?)", Time.current) }
+  scope :today, lambda { where(created_at: Date.current.beginning_of_day..Date.current.end_of_day) }
 
   def max_per_day
     return if errors.any?
diff --git a/spec/models/direct_message_spec.rb b/spec/models/direct_message_spec.rb
index 1c67c363f..ccb072bf7 100644
--- a/spec/models/direct_message_spec.rb
+++ b/spec/models/direct_message_spec.rb
@@ -75,11 +75,11 @@ describe DirectMessage do
 
   describe "scopes" do
 
-    describe "today" do
+    describe "today", :with_non_utc_time_zone do
       it "returns direct messages created today" do
-        direct_message1 = create(:direct_message, created_at: Time.now.utc.beginning_of_day + 3.hours)
-        direct_message2 = create(:direct_message, created_at: Time.now.utc)
-        direct_message3 = create(:direct_message, created_at: Time.now.utc.end_of_day)
+        create(:direct_message, created_at: Date.current.beginning_of_day)
+        create(:direct_message, created_at: Time.current)
+        create(:direct_message, created_at: Date.current.end_of_day)
 
         expect(described_class.today.count).to eq 3
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2b5458e96..dccfd4d3d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -104,6 +104,12 @@ RSpec.configure do |config|
     allow(Date).to receive(:today).and_return(Time.now.to_date)
   end
 
+  config.before(:each, :with_non_utc_time_zone) do
+    application_zone = ActiveSupport::TimeZone.new("Madrid")
+
+    allow(Time).to receive(:zone).and_return(application_zone)
+  end
+
   # Allows RSpec to persist some state between runs in order to support
   # the `--only-failures` and `--next-failure` CLI options.
   config.example_status_persistence_file_path = "spec/examples.txt"