diff --git a/models/Asset.php b/models/Asset.php
index e497754b..8bf1e26e 100644
--- a/models/Asset.php
+++ b/models/Asset.php
@@ -606,14 +606,12 @@ class Asset
 			FROM assets_tags AS t
 			INNER JOIN assets AS a ON a.id_asset = t.id_asset
 			WHERE t.id_tag = {int:id_tag} AND
-				a.date_captured <= {datetime:date_captured} AND
-				a.id_asset != {int:id_asset}
-			ORDER BY a.date_captured DESC'
+				(a.date_captured, a.id_asset) < ({datetime:date_captured}, {int:id_asset})
+			ORDER BY a.date_captured DESC, a.id_asset DESC'
 			: '
 			FROM assets AS a
-			WHERE date_captured >= {datetime:date_captured} AND
-				a.id_asset != {int:id_asset}
-			ORDER BY date_captured ASC')
+			WHERE (a.date_captured, a.id_asset) > ({datetime:date_captured}, {int:id_asset})
+			ORDER BY date_captured ASC, a.id_asset ASC')
 			 . '
 			LIMIT 1',
 			[
@@ -639,14 +637,12 @@ class Asset
 			FROM assets_tags AS t
 			INNER JOIN assets AS a ON a.id_asset = t.id_asset
 			WHERE t.id_tag = {int:id_tag} AND
-				a.date_captured >= {datetime:date_captured} AND
-				a.id_asset != {int:id_asset}
-			ORDER BY a.date_captured ASC'
+				(a.date_captured, a.id_asset) > ({datetime:date_captured}, {int:id_asset})
+			ORDER BY a.date_captured ASC, a.id_asset ASC'
 			: '
 			FROM assets AS a
-			WHERE date_captured <= {datetime:date_captured} AND
-				a.id_asset != {int:id_asset}
-			ORDER BY date_captured DESC')
+			WHERE (a.date_captured, a.id_asset) < ({datetime:date_captured}, {int:id_asset})
+			ORDER BY date_captured DESC, a.id_asset DESC')
 			 . '
 			LIMIT 1',
 			[