diff --git a/src/models/searchmodel.h b/src/models/searchmodel.h
index 9a2d93141..c898cc56f 100644
--- a/src/models/searchmodel.h
+++ b/src/models/searchmodel.h
@@ -122,7 +122,7 @@ private:
 
     QString m_searchText;
     QPointer<NeoChatRoom> m_room;
-    Quotient::Omittable<Quotient::SearchJob::ResultRoomEvents> m_result = Quotient::none;
+    std::optional<Quotient::SearchJob::ResultRoomEvents> m_result = std::nullopt;
     Quotient::SearchJob *m_job = nullptr;
     bool m_searching = false;
 };
diff --git a/src/spacehierarchycache.h b/src/spacehierarchycache.h
index 9dc3b323f..d493ea14b 100644
--- a/src/spacehierarchycache.h
+++ b/src/spacehierarchycache.h
@@ -113,7 +113,7 @@ private:
     QHash<QString, QList<QString>> m_spaceHierarchy;
     void cacheSpaceHierarchy();
 
-    QHash<QString, Quotient::Omittable<QString>> m_nextBatchTokens;
+    QHash<QString, std::optional<QString>> m_nextBatchTokens;
     void populateSpaceHierarchy(const QString &spaceId);
     void addBatch(const QString &spaceId, Quotient::GetSpaceHierarchyJob *job);
     QPointer<NeoChatConnection> m_connection;