diff --git a/src/tidal/tidalurlhandler.cpp b/src/tidal/tidalurlhandler.cpp
new file mode 100644
index 000000000..864981045
--- /dev/null
+++ b/src/tidal/tidalurlhandler.cpp
@@ -0,0 +1,65 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2018, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "tidalurlhandler.h"
+
+#include "core/application.h"
+#include "core/taskmanager.h"
+#include "core/iconloader.h"
+#include "core/logging.h"
+#include "core/song.h"
+#include "playlistparsers/playlistparser.h"
+#include "tidal/tidalservice.h"
+#include "internet/internetmodel.h"
+
+TidalUrlHandler::TidalUrlHandler(
+    Application *app, TidalService *service)
+    : UrlHandler(service), app_(app), service_(service), task_id_(-1) {
+
+  connect(service, SIGNAL(StreamURLFinished(QUrl, Song::FileType)), this, SLOT(GetStreamURLFinished(QUrl, Song::FileType)));
+
+}
+
+QString TidalUrlHandler::scheme() const { return service_->url_scheme(); }
+QIcon TidalUrlHandler::icon() const { return IconLoader::Load("tidal"); }
+
+UrlHandler::LoadResult TidalUrlHandler::StartLoading(const QUrl &url) {
+
+  LoadResult ret(url);
+  if (task_id_ != -1) return ret;
+  last_original_url_ = url;
+  task_id_ = app_->task_manager()->StartTask(QString("Loading %1 stream...").arg(url.scheme()));
+  service_->GetStreamURL(url);
+  ret.type_ = LoadResult::WillLoadAsynchronously;
+  return ret;
+
+}
+
+void TidalUrlHandler::GetStreamURLFinished(QUrl url, Song::FileType filetype) {
+
+  if (task_id_ == -1) return;
+  CancelTask();
+  emit AsyncLoadComplete(LoadResult(last_original_url_, LoadResult::TrackAvailable, url, filetype));
+
+}
+
+void TidalUrlHandler::CancelTask() {
+  app_->task_manager()->SetTaskFinished(task_id_);
+  task_id_ = -1;
+}
diff --git a/src/tidal/tidalurlhandler.h b/src/tidal/tidalurlhandler.h
new file mode 100644
index 000000000..6d6e7e902
--- /dev/null
+++ b/src/tidal/tidalurlhandler.h
@@ -0,0 +1,52 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2018, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef TIDALURLHANDLER_H
+#define TIDALURLHANDLER_H
+
+#include "core/urlhandler.h"
+#include "core/song.h"
+
+class Application;
+class TidalService;
+
+class TidalUrlHandler : public UrlHandler {
+  Q_OBJECT
+
+ public:
+  TidalUrlHandler(Application *app, TidalService *service);
+
+  QString scheme() const;
+  QIcon icon() const;
+  LoadResult StartLoading(const QUrl &url);
+
+  void CancelTask();
+  
+ private slots:
+  void GetStreamURLFinished(QUrl url, Song::FileType filetype);
+
+ private:
+  Application *app_;
+  TidalService *service_;
+  int task_id_;
+  QUrl last_original_url_;
+
+};
+
+#endif