diff --git a/src/core/mpris_common.h b/src/core/mpris_common.h
index 755a19338..2832452a0 100644
--- a/src/core/mpris_common.h
+++ b/src/core/mpris_common.h
@@ -55,7 +55,7 @@ inline void AddMetadata(const QString &key, const QDateTime &metadata, QVariantM
   if (metadata.isValid()) (*map)[key] = metadata;
 }
 
-inline QString AsMPRISDateTimeType(const int time) {
+inline QString AsMPRISDateTimeType(const qint64 time) {
   return time != -1 ? QDateTime::fromSecsSinceEpoch(time).toString(Qt::ISODate) : "";
 }
 
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 6daeee10e..33d743a8b 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -332,7 +332,7 @@ qint64 Song::ctime() const { return d->ctime_; }
 
 int Song::playcount() const { return d->playcount_; }
 int Song::skipcount() const { return d->skipcount_; }
-int Song::lastplayed() const { return d->lastplayed_; }
+qint64 Song::lastplayed() const { return d->lastplayed_; }
 
 bool Song::compilation_detected() const { return d->compilation_detected_; }
 bool Song::compilation_off() const { return d->compilation_off_; }
@@ -441,7 +441,7 @@ void Song::set_unavailable(bool v) { d->unavailable_ = v; }
 
 void Song::set_playcount(int v) { d->playcount_ = v; }
 void Song::set_skipcount(int v) { d->skipcount_ = v; }
-void Song::set_lastplayed(int v) { d->lastplayed_ = v; }
+void Song::set_lastplayed(qint64 v) { d->lastplayed_ = v; }
 
 void Song::set_compilation_detected(bool v) { d->compilation_detected_ = v; }
 void Song::set_compilation_on(bool v) { d->compilation_on_ = v; }
@@ -958,7 +958,7 @@ void Song::InitFromQuery(const SqlRow &q, bool reliable_metadata, int col) {
       d->skipcount_ = q.value(x).isNull() ? 0 : q.value(x).toInt();
     }
     else if (Song::kColumns.value(i) == "lastplayed") {
-      d->lastplayed_ = toint(x);
+      d->lastplayed_ = tolonglong(x);
     }
 
     else if (Song::kColumns.value(i) == "compilation_detected") {
diff --git a/src/core/song.h b/src/core/song.h
index 7ea8873cd..418e7750b 100644
--- a/src/core/song.h
+++ b/src/core/song.h
@@ -230,7 +230,7 @@ class Song {
 
   int playcount() const;
   int skipcount() const;
-  int lastplayed() const;
+  qint64 lastplayed() const;
 
   bool compilation_detected() const;
   bool compilation_off() const;
@@ -337,7 +337,7 @@ class Song {
 
   void set_playcount(int v);
   void set_skipcount(int v);
-  void set_lastplayed(int v);
+  void set_lastplayed(qint64 v);
 
   void set_compilation_detected(bool v);
   void set_compilation_on(bool v);
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 8f8463d9b..2de8ada26 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -152,11 +152,11 @@ QString WordyTimeNanosec(qint64 nanoseconds) {
   return WordyTime(nanoseconds / kNsecPerSec);
 }
 
-QString Ago(int seconds_since_epoch, const QLocale &locale) {
+QString Ago(qint64 seconds_since_epoch, const QLocale &locale) {
 
   const QDateTime now = QDateTime::currentDateTime();
   const QDateTime then = QDateTime::fromSecsSinceEpoch(seconds_since_epoch);
-  const int days_ago = then.date().daysTo(now.date());
+  const qint64 days_ago = then.date().daysTo(now.date());
   const QString time = then.time().toString(locale.timeFormat(QLocale::ShortFormat));
 
   if (days_ago == 0) return tr("Today") + " " + time;
@@ -170,7 +170,7 @@ QString Ago(int seconds_since_epoch, const QLocale &locale) {
 QString PrettyFutureDate(const QDate &date) {
 
   const QDate now = QDate::currentDate();
-  const int delta_days = now.daysTo(date);
+  const qint64 delta_days = now.daysTo(date);
 
   if (delta_days < 0) return QString();
   if (delta_days == 0) return tr("Today");
diff --git a/src/core/utilities.h b/src/core/utilities.h
index 15de9d238..a83901190 100644
--- a/src/core/utilities.h
+++ b/src/core/utilities.h
@@ -54,7 +54,7 @@ QString PrettySize(quint64 bytes);
 QString PrettySize(const QSize &size);
 QString WordyTime(quint64 seconds);
 QString WordyTimeNanosec(qint64 nanoseconds);
-QString Ago(int seconds_since_epoch, const QLocale &locale);
+QString Ago(qint64 seconds_since_epoch, const QLocale &locale);
 QString PrettyFutureDate(const QDate &date);
 
 QString ColorToRgba(const QColor &color);
diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp
index 019bb610f..dfcc6cb4c 100644
--- a/src/playlist/playlistdelegates.cpp
+++ b/src/playlist/playlistdelegates.cpp
@@ -326,7 +326,7 @@ QString DateItemDelegate::displayText(const QVariant &value, const QLocale &loca
   Q_UNUSED(locale);
 
   bool ok = false;
-  int time = value.toInt(&ok);
+  qint64 time = value.toLongLong(&ok);
 
   if (!ok || time == -1)
     return QString();
@@ -338,7 +338,7 @@ QString DateItemDelegate::displayText(const QVariant &value, const QLocale &loca
 QString LastPlayedItemDelegate::displayText(const QVariant &value, const QLocale &locale) const {
 
   bool ok = false;
-  const int time = value.toInt(&ok);
+  const qint64 time = value.toLongLong(&ok);
 
   if (!ok || time == -1)
     return tr("Never");