diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 064eebca..bdaaeddb 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -401,6 +401,7 @@ class CoreRequestBuilder {
 		if ($since > 0) {
 			$dTime = new \DateTime();
 			$dTime->setTimestamp($since);
+			// This line stuck on sqlite
 			$this->limitToDBFieldDateTime($qb, 'published_time', $dTime);
 		}
 
diff --git a/lib/Db/NotesRequestBuilder.php b/lib/Db/NotesRequestBuilder.php
index 9b68a4d9..137abae0 100644
--- a/lib/Db/NotesRequestBuilder.php
+++ b/lib/Db/NotesRequestBuilder.php
@@ -161,7 +161,9 @@ class NotesRequestBuilder extends CoreRequestBuilder {
 			)
 		);
 
-		$qb->rightJoin(
+		// TODO: SQLite does not support RIGHT JOIN
+//		$qb->rightJoin(
+		$qb->join(
 			$this->defaultSelectAlias, CoreRequestBuilder::TABLE_SERVER_FOLLOWS, 'f',
 			$orX
 		);