diff --git a/app/models/direct_message.rb b/app/models/direct_message.rb
index b36cca705..ae14e652d 100644
--- a/app/models/direct_message.rb
+++ b/app/models/direct_message.rb
@@ -8,7 +8,7 @@ class DirectMessage < ActiveRecord::Base
   validates :receiver, presence: true
   validate  :max_per_day
 
-  scope :today, lambda { where('DATE(created_at) = ?', Date.current) }
+  scope :today, lambda { where('DATE(created_at) = DATE(?)', Time.current) }
 
   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 05c3f75cd..28b30b0ce 100644
--- a/spec/models/direct_message_spec.rb
+++ b/spec/models/direct_message_spec.rb
@@ -65,9 +65,9 @@ describe DirectMessage do
 
     describe "today" do
       it "should return direct messages created today" do
-        direct_message1 = create(:direct_message, created_at: Time.current.beginning_of_day + 3.hours)
-        direct_message2 = create(:direct_message, created_at: Time.current)
-        direct_message3 = create(:direct_message, created_at: Time.current.end_of_day)
+        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)
 
         expect(DirectMessage.today.count).to eq 3
       end