diff --git a/media/client/ipc/include/MediaPipelineIpc.h b/media/client/ipc/include/MediaPipelineIpc.h
index 5e50dd4f4..db45d00d9 100644
--- a/media/client/ipc/include/MediaPipelineIpc.h
+++ b/media/client/ipc/include/MediaPipelineIpc.h
@@ -79,7 +79,7 @@ class MediaPipelineIpc : public IMediaPipelineIpc, public IpcModule
 
     bool setVideoWindow(uint32_t x, uint32_t y, uint32_t width, uint32_t height) override;
 
-    bool play() override;
+    bool play(bool &async) override;
 
     bool pause() override;
 
diff --git a/media/client/ipc/interface/IMediaPipelineIpc.h b/media/client/ipc/interface/IMediaPipelineIpc.h
index 1d055d2b7..782a1931b 100644
--- a/media/client/ipc/interface/IMediaPipelineIpc.h
+++ b/media/client/ipc/interface/IMediaPipelineIpc.h
@@ -126,9 +126,11 @@ class IMediaPipelineIpc
     /**
      * @brief Request play on the playback session.
      *
+     * @param[out] async     : True if play method call is asynchronous
+     *
      * @retval true on success.
      */
-    virtual bool play() = 0;
+    virtual bool play(bool &async) = 0;
 
     /**
      * @brief Request pause on the playback session.
diff --git a/media/client/ipc/source/MediaPipelineIpc.cpp b/media/client/ipc/source/MediaPipelineIpc.cpp
index 23c0375da..ff1b09847 100644
--- a/media/client/ipc/source/MediaPipelineIpc.cpp
+++ b/media/client/ipc/source/MediaPipelineIpc.cpp
@@ -348,7 +348,7 @@ bool MediaPipelineIpc::setVideoWindow(uint32_t x, uint32_t y, uint32_t width, ui
     return true;
 }
 
-bool MediaPipelineIpc::play()
+bool MediaPipelineIpc::play(bool &async)
 {
     if (!reattachChannelIfRequired())
     {
@@ -375,6 +375,8 @@ bool MediaPipelineIpc::play()
         return false;
     }
 
+    async = response.async();
+
     return true;
 }
 
diff --git a/media/client/main/include/MediaPipeline.h b/media/client/main/include/MediaPipeline.h
index 74bf8d13b..13075a511 100644
--- a/media/client/main/include/MediaPipeline.h
+++ b/media/client/main/include/MediaPipeline.h
@@ -118,7 +118,7 @@ class MediaPipeline : public IMediaPipelineAndIControlClient, public IMediaPipel
 
     bool allSourcesAttached() override;
 
-    bool play() override;
+    bool play(bool &async) override;
 
     bool pause() override;
 
diff --git a/media/client/main/include/MediaPipelineProxy.h b/media/client/main/include/MediaPipelineProxy.h
index cf0283cd2..b38371963 100644
--- a/media/client/main/include/MediaPipelineProxy.h
+++ b/media/client/main/include/MediaPipelineProxy.h
@@ -52,7 +52,7 @@ class MediaPipelineProxy : public IMediaPipelineAndIControlClient
 
     bool allSourcesAttached() override { return m_mediaPipeline->allSourcesAttached(); }
 
-    bool play() override { return m_mediaPipeline->play(); }
+    bool play(bool &async) override { return m_mediaPipeline->play(async); }
 
     bool pause() override { return m_mediaPipeline->pause(); }
 
diff --git a/media/client/main/source/MediaPipeline.cpp b/media/client/main/source/MediaPipeline.cpp
index 280aff919..e529fe3b6 100644
--- a/media/client/main/source/MediaPipeline.cpp
+++ b/media/client/main/source/MediaPipeline.cpp
@@ -252,11 +252,11 @@ bool MediaPipeline::allSourcesAttached()
     return m_mediaPipelineIpc->allSourcesAttached();
 }
 
-bool MediaPipeline::play()
+bool MediaPipeline::play(bool &async)
 {
     RIALTO_CLIENT_LOG_DEBUG("entry:");
 
-    return m_mediaPipelineIpc->play();
+    return m_mediaPipelineIpc->play(async);
 }
 
 bool MediaPipeline::pause()
diff --git a/media/public/include/IMediaPipeline.h b/media/public/include/IMediaPipeline.h
index 1064ccc1e..e6c68787e 100644
--- a/media/public/include/IMediaPipeline.h
+++ b/media/public/include/IMediaPipeline.h
@@ -1119,16 +1119,15 @@ class IMediaPipeline
     /**
      * @brief Starts playback of the media.
      *
-     * This method is considered to be asynchronous and MUST NOT block
-     * but should request playback and then return.
-     *
      * Once the backend is successfully playing it should notify the
      * media player client of playback state
      * IMediaPipelineClient::PlaybackState::PLAYING.
      *
+     * @param[out] async     : True if play method call is asynchronous
+     *
      * @retval true on success.
      */
-    virtual bool play() = 0;
+    virtual bool play(bool &async) = 0;
 
     /**
      * @brief Pauses playback of the media.
diff --git a/media/server/gstplayer/include/GstGenericPlayer.h b/media/server/gstplayer/include/GstGenericPlayer.h
index 22fd800e0..fd633cd48 100644
--- a/media/server/gstplayer/include/GstGenericPlayer.h
+++ b/media/server/gstplayer/include/GstGenericPlayer.h
@@ -36,6 +36,7 @@
 #include "tasks/IGenericPlayerTaskFactory.h"
 #include "tasks/IPlayerTask.h"
 #include <IMediaPipeline.h>
+#include <atomic>
 #include <memory>
 #include <string>
 #include <utility>
@@ -108,7 +109,7 @@ class GstGenericPlayer : public IGstGenericPlayer, public IGstGenericPlayerPriva
     void attachSource(const std::unique_ptr<IMediaPipeline::MediaSource> &mediaSource) override;
     void removeSource(const MediaSourceType &mediaSourceType) override;
     void allSourcesAttached() override;
-    void play() override;
+    void play(bool &async) override;
     void pause() override;
     void stop() override;
     void attachSamples(const IMediaPipeline::MediaSegmentVector &mediaSegments) override;
@@ -168,7 +169,7 @@ class GstGenericPlayer : public IGstGenericPlayer, public IGstGenericPlayerPriva
     void updateVideoCaps(int32_t width, int32_t height, Fraction frameRate,
                          const std::shared_ptr<CodecData> &codecData) override;
     void addAudioClippingToBuffer(GstBuffer *buffer, uint64_t clippingStart, uint64_t clippingEnd) const override;
-    bool changePipelineState(GstState newState) override;
+    GstStateChangeReturn changePipelineState(GstState newState) override;
     int64_t getPosition(GstElement *element) override;
     void startPositionReportingAndCheckAudioUnderflowTimer() override;
     void stopPositionReportingAndCheckAudioUnderflowTimer() override;
@@ -427,6 +428,11 @@ class GstGenericPlayer : public IGstGenericPlayer, public IGstGenericPlayerPriva
      * @brief The postponed flush tasks
      */
     std::vector<std::pair<MediaSourceType, bool>> m_postponedFlushes{};
+
+    /**
+     * @brief The ongoing state change operations counter
+     */
+    std::atomic<uint32_t> m_ongoingStateChangesNumber{0};
 };
 
 } // namespace firebolt::rialto::server
diff --git a/media/server/gstplayer/include/IGstGenericPlayerPrivate.h b/media/server/gstplayer/include/IGstGenericPlayerPrivate.h
index 1848c8960..7ffb26b2c 100644
--- a/media/server/gstplayer/include/IGstGenericPlayerPrivate.h
+++ b/media/server/gstplayer/include/IGstGenericPlayerPrivate.h
@@ -174,9 +174,9 @@ class IGstGenericPlayerPrivate
      *
      * @param[in] newState    : The desired state.
      *
-     * @retval true on success.
+     * @retval state change status
      */
-    virtual bool changePipelineState(GstState newState) = 0;
+    virtual GstStateChangeReturn changePipelineState(GstState newState) = 0;
 
     /**
      * @brief Gets the current position of the element
diff --git a/media/server/gstplayer/interface/IGstGenericPlayer.h b/media/server/gstplayer/interface/IGstGenericPlayer.h
index e01edd364..d07b56f81 100644
--- a/media/server/gstplayer/interface/IGstGenericPlayer.h
+++ b/media/server/gstplayer/interface/IGstGenericPlayer.h
@@ -105,14 +105,15 @@ class IGstGenericPlayer
     /**
      * @brief Starts playback of the media.
      *
-     * This method is considered to be asynchronous and MUST NOT block
-     * but should request playback and then return.
-     *
      * Once the backend is successfully playing it should notify the
-     * media player client of playback state PlaybackState::PLAYING.
+     * media player client of playback state
+     * IMediaPipelineClient::PlaybackState::PLAYING.
      *
+     * @param[out] async     : True if play method call is asynchronous
+     *
+     * @retval true on success.
      */
-    virtual void play() = 0;
+    virtual void play(bool &async) = 0;
 
     /**
      * @brief Pauses playback of the media.
diff --git a/media/server/gstplayer/source/GstGenericPlayer.cpp b/media/server/gstplayer/source/GstGenericPlayer.cpp
index 1b0976a73..6f229c49f 100644
--- a/media/server/gstplayer/source/GstGenericPlayer.cpp
+++ b/media/server/gstplayer/source/GstGenericPlayer.cpp
@@ -1186,16 +1186,32 @@ void GstGenericPlayer::cancelUnderflow(firebolt::rialto::MediaSourceType mediaSo
     }
 }
 
-void GstGenericPlayer::play()
+void GstGenericPlayer::play(bool &async)
 {
-    if (m_workerThread)
+    if (0 == m_ongoingStateChangesNumber)
     {
-        m_workerThread->enqueueTask(m_taskFactory->createPlay(*this));
+        // Operation called on main thread, because PAUSED->PLAYING change is synchronous and needs to be done fast.
+        //
+        // m_context.pipeline can be used, because it's modified only in GstGenericPlayer
+        // constructor and destructor. GstGenericPlayer is created/destructed on main thread, so we won't have a crash here.
+        ++m_ongoingStateChangesNumber;
+        async = (changePipelineState(GST_STATE_PLAYING) == GST_STATE_CHANGE_ASYNC);
+        RIALTO_SERVER_LOG_MIL("State change to PLAYING requested");
+    }
+    else
+    {
+        ++m_ongoingStateChangesNumber;
+        async = true;
+        if (m_workerThread)
+        {
+            m_workerThread->enqueueTask(m_taskFactory->createPlay(*this));
+        }
     }
 }
 
 void GstGenericPlayer::pause()
 {
+    ++m_ongoingStateChangesNumber;
     if (m_workerThread)
     {
         m_workerThread->enqueueTask(m_taskFactory->createPause(m_context, *this));
@@ -1204,29 +1220,32 @@ void GstGenericPlayer::pause()
 
 void GstGenericPlayer::stop()
 {
+    ++m_ongoingStateChangesNumber;
     if (m_workerThread)
     {
         m_workerThread->enqueueTask(m_taskFactory->createStop(m_context, *this));
     }
 }
 
-bool GstGenericPlayer::changePipelineState(GstState newState)
+GstStateChangeReturn GstGenericPlayer::changePipelineState(GstState newState)
 {
     if (!m_context.pipeline)
     {
         RIALTO_SERVER_LOG_ERROR("Change state failed - pipeline is nullptr");
         if (m_gstPlayerClient)
             m_gstPlayerClient->notifyPlaybackState(PlaybackState::FAILURE);
-        return false;
+        --m_ongoingStateChangesNumber;
+        return GST_STATE_CHANGE_FAILURE;
     }
-    if (m_gstWrapper->gstElementSetState(m_context.pipeline, newState) == GST_STATE_CHANGE_FAILURE)
+    const GstStateChangeReturn result{m_gstWrapper->gstElementSetState(m_context.pipeline, newState)};
+    if (result == GST_STATE_CHANGE_FAILURE)
     {
         RIALTO_SERVER_LOG_ERROR("Change state failed - Gstreamer returned an error");
         if (m_gstPlayerClient)
             m_gstPlayerClient->notifyPlaybackState(PlaybackState::FAILURE);
-        return false;
     }
-    return true;
+    --m_ongoingStateChangesNumber;
+    return result;
 }
 
 int64_t GstGenericPlayer::getPosition(GstElement *element)
diff --git a/media/server/ipc/source/MediaPipelineModuleService.cpp b/media/server/ipc/source/MediaPipelineModuleService.cpp
index 77c1387aa..7e08ec2f7 100644
--- a/media/server/ipc/source/MediaPipelineModuleService.cpp
+++ b/media/server/ipc/source/MediaPipelineModuleService.cpp
@@ -566,11 +566,13 @@ void MediaPipelineModuleService::play(::google::protobuf::RpcController *control
                                       ::firebolt::rialto::PlayResponse *response, ::google::protobuf::Closure *done)
 {
     RIALTO_SERVER_LOG_DEBUG("entry:");
-    if (!m_mediaPipelineService.play(request->session_id()))
+    bool async{false};
+    if (!m_mediaPipelineService.play(request->session_id(), async))
     {
         RIALTO_SERVER_LOG_ERROR("Play failed");
         controller->SetFailed("Operation failed");
     }
+    response->set_async(async);
     done->Run();
 }
 
diff --git a/media/server/main/include/MediaPipelineServerInternal.h b/media/server/main/include/MediaPipelineServerInternal.h
index e546ee795..cfd0cd2a7 100644
--- a/media/server/main/include/MediaPipelineServerInternal.h
+++ b/media/server/main/include/MediaPipelineServerInternal.h
@@ -99,7 +99,7 @@ class MediaPipelineServerInternal : public IMediaPipelineServerInternal, public
 
     bool allSourcesAttached() override;
 
-    bool play() override;
+    bool play(bool &async) override;
 
     bool pause() override;
 
@@ -346,9 +346,11 @@ class MediaPipelineServerInternal : public IMediaPipelineServerInternal, public
     /**
      * @brief Play internally, only to be called on the main thread.
      *
+     * @param[out] async     : True if play method call is asynchronous
+     *
      * @retval true on success.
      */
-    bool playInternal();
+    bool playInternal(bool &async);
 
     /**
      * @brief Pause internally, only to be called on the main thread.
diff --git a/media/server/main/source/MediaPipelineServerInternal.cpp b/media/server/main/source/MediaPipelineServerInternal.cpp
index f76396bec..197240e6a 100644
--- a/media/server/main/source/MediaPipelineServerInternal.cpp
+++ b/media/server/main/source/MediaPipelineServerInternal.cpp
@@ -335,18 +335,18 @@ bool MediaPipelineServerInternal::allSourcesAttachedInternal()
     return true;
 }
 
-bool MediaPipelineServerInternal::play()
+bool MediaPipelineServerInternal::play(bool &async)
 {
     RIALTO_SERVER_LOG_DEBUG("entry:");
 
     bool result;
-    auto task = [&]() { result = playInternal(); };
+    auto task = [&]() { result = playInternal(async); };
 
-    m_mainThread->enqueueTaskAndWait(m_mainThreadClientId, task);
+    m_mainThread->enqueuePriorityTaskAndWait(m_mainThreadClientId, task);
     return result;
 }
 
-bool MediaPipelineServerInternal::playInternal()
+bool MediaPipelineServerInternal::playInternal(bool &async)
 {
     if (!m_gstPlayer)
     {
@@ -354,7 +354,7 @@ bool MediaPipelineServerInternal::playInternal()
         return false;
     }
 
-    m_gstPlayer->play();
+    m_gstPlayer->play(async);
     return true;
 }
 
diff --git a/media/server/service/include/IMediaPipelineService.h b/media/server/service/include/IMediaPipelineService.h
index 7ba9e8a1c..ae1fc5e04 100644
--- a/media/server/service/include/IMediaPipelineService.h
+++ b/media/server/service/include/IMediaPipelineService.h
@@ -48,7 +48,7 @@ class IMediaPipelineService
     virtual bool attachSource(int sessionId, const std::unique_ptr<IMediaPipeline::MediaSource> &source) = 0;
     virtual bool removeSource(int sessionId, std::int32_t sourceId) = 0;
     virtual bool allSourcesAttached(int sessionId) = 0;
-    virtual bool play(int sessionId) = 0;
+    virtual bool play(int sessionId, bool &async) = 0;
     virtual bool pause(int sessionId) = 0;
     virtual bool stop(int sessionId) = 0;
     virtual bool setPlaybackRate(int sessionId, double rate) = 0;
diff --git a/media/server/service/source/MediaPipelineService.cpp b/media/server/service/source/MediaPipelineService.cpp
index 5e7c40063..5d2212017 100644
--- a/media/server/service/source/MediaPipelineService.cpp
+++ b/media/server/service/source/MediaPipelineService.cpp
@@ -169,7 +169,7 @@ bool MediaPipelineService::allSourcesAttached(int sessionId)
     return mediaPipelineIter->second->allSourcesAttached();
 }
 
-bool MediaPipelineService::play(int sessionId)
+bool MediaPipelineService::play(int sessionId, bool &async)
 {
     RIALTO_SERVER_LOG_INFO("MediaPipelineService requested to play, session id: %d", sessionId);
 
@@ -180,7 +180,7 @@ bool MediaPipelineService::play(int sessionId)
         RIALTO_SERVER_LOG_ERROR("Session with id: %d does not exists", sessionId);
         return false;
     }
-    return mediaPipelineIter->second->play();
+    return mediaPipelineIter->second->play(async);
 }
 
 bool MediaPipelineService::pause(int sessionId)
diff --git a/media/server/service/source/MediaPipelineService.h b/media/server/service/source/MediaPipelineService.h
index d68edadff..bf9ec234f 100644
--- a/media/server/service/source/MediaPipelineService.h
+++ b/media/server/service/source/MediaPipelineService.h
@@ -59,7 +59,7 @@ class MediaPipelineService : public IMediaPipelineService
     bool attachSource(int sessionId, const std::unique_ptr<IMediaPipeline::MediaSource> &source) override;
     bool removeSource(int sessionId, std::int32_t sourceId) override;
     bool allSourcesAttached(int sessionId) override;
-    bool play(int sessionId) override;
+    bool play(int sessionId, bool &async) override;
     bool pause(int sessionId) override;
     bool stop(int sessionId) override;
     bool setPlaybackRate(int sessionId, double rate) override;
diff --git a/proto/mediapipelinemodule.proto b/proto/mediapipelinemodule.proto
index f56a19970..1807810de 100644
--- a/proto/mediapipelinemodule.proto
+++ b/proto/mediapipelinemodule.proto
@@ -261,7 +261,8 @@ message SetVideoWindowResponse {
  * @fn void play(int session_id)
  * @brief Starts playback on a session.
  *
- * @param[in]  session_id   The id of the A/V session.
+ * @param[in]   session_id  The id of the A/V session.
+ * @param[out]  async       True if play method call is asynchronous
  *
  * This method is asynchronous. Once the backend is successfully playing it will notify the media player client of
  * playback state.
@@ -271,6 +272,7 @@ message PlayRequest {
     optional int32 session_id = 1 [default = -1];
 }
 message PlayResponse {
+    optional bool async = 1 [default = true];
 }
 
 /**
diff --git a/tests/componenttests/client/tests/base/MediaPipelineTestMethods.cpp b/tests/componenttests/client/tests/base/MediaPipelineTestMethods.cpp
index 51ef2b5d4..e91d67bbb 100644
--- a/tests/componenttests/client/tests/base/MediaPipelineTestMethods.cpp
+++ b/tests/componenttests/client/tests/base/MediaPipelineTestMethods.cpp
@@ -892,7 +892,8 @@ void MediaPipelineTestMethods::shouldNotifyPlaybackStateFailure()
 
 void MediaPipelineTestMethods::playFailure()
 {
-    EXPECT_EQ(m_mediaPipeline->play(), false);
+    bool async{false};
+    EXPECT_EQ(m_mediaPipeline->play(async), false);
 }
 
 void MediaPipelineTestMethods::pauseFailure()
@@ -2033,7 +2034,8 @@ void MediaPipelineTestMethods::haveDataInternal(const std::unique_ptr<IMediaPipe
 
 void MediaPipelineTestMethods::playInternal(const std::unique_ptr<IMediaPipeline> &mediaPipeline, const bool status)
 {
-    EXPECT_EQ(mediaPipeline->play(), status);
+    bool async{false};
+    EXPECT_EQ(mediaPipeline->play(async), status);
 }
 
 void MediaPipelineTestMethods::sendNotifyPlaybackStateInternal(const int32_t sessionId, const PlaybackState &state)
diff --git a/tests/unittests/media/client/ipc/mediaPipelineIpc/PlayPauseTest.cpp b/tests/unittests/media/client/ipc/mediaPipelineIpc/PlayPauseTest.cpp
index 2db4edf0b..dec195144 100644
--- a/tests/unittests/media/client/ipc/mediaPipelineIpc/PlayPauseTest.cpp
+++ b/tests/unittests/media/client/ipc/mediaPipelineIpc/PlayPauseTest.cpp
@@ -43,12 +43,13 @@ class RialtoClientMediaPipelineIpcPlayPauseTest : public MediaPipelineIpcTestBas
  */
 TEST_F(RialtoClientMediaPipelineIpcPlayPauseTest, PlaySuccess)
 {
+    bool async{false};
     expectIpcApiCallSuccess();
 
     EXPECT_CALL(*m_channelMock, CallMethod(methodMatcher("play"), m_controllerMock.get(),
                                            playRequestMatcher(m_sessionId), _, m_blockingClosureMock.get()));
 
-    EXPECT_EQ(m_mediaPipelineIpc->play(), true);
+    EXPECT_EQ(m_mediaPipelineIpc->play(async), true);
 }
 
 /**
@@ -56,10 +57,11 @@ TEST_F(RialtoClientMediaPipelineIpcPlayPauseTest, PlaySuccess)
  */
 TEST_F(RialtoClientMediaPipelineIpcPlayPauseTest, PlayChannelDisconnected)
 {
+    bool async{false};
     expectIpcApiCallDisconnected();
     expectUnsubscribeEvents();
 
-    EXPECT_EQ(m_mediaPipelineIpc->play(), false);
+    EXPECT_EQ(m_mediaPipelineIpc->play(async), false);
 
     // Reattach channel on destroySession
     EXPECT_CALL(*m_ipcClientMock, getChannel()).WillOnce(Return(m_channelMock)).RetiresOnSaturation();
@@ -71,13 +73,14 @@ TEST_F(RialtoClientMediaPipelineIpcPlayPauseTest, PlayChannelDisconnected)
  */
 TEST_F(RialtoClientMediaPipelineIpcPlayPauseTest, PlayReconnectChannel)
 {
+    bool async{false};
     expectIpcApiCallReconnected();
     expectUnsubscribeEvents();
     expectSubscribeEvents();
 
     EXPECT_CALL(*m_channelMock, CallMethod(methodMatcher("play"), _, _, _, _));
 
-    EXPECT_EQ(m_mediaPipelineIpc->play(), true);
+    EXPECT_EQ(m_mediaPipelineIpc->play(async), true);
 }
 
 /**
@@ -85,11 +88,12 @@ TEST_F(RialtoClientMediaPipelineIpcPlayPauseTest, PlayReconnectChannel)
  */
 TEST_F(RialtoClientMediaPipelineIpcPlayPauseTest, PlayFailure)
 {
+    bool async{false};
     expectIpcApiCallFailure();
 
     EXPECT_CALL(*m_channelMock, CallMethod(methodMatcher("play"), _, _, _, _));
 
-    EXPECT_EQ(m_mediaPipelineIpc->play(), false);
+    EXPECT_EQ(m_mediaPipelineIpc->play(async), false);
 }
 
 /**
diff --git a/tests/unittests/media/client/main/mediaPipeline/MediaPipelineProxyTest.cpp b/tests/unittests/media/client/main/mediaPipeline/MediaPipelineProxyTest.cpp
index be98cad21..6e22bdf4d 100644
--- a/tests/unittests/media/client/main/mediaPipeline/MediaPipelineProxyTest.cpp
+++ b/tests/unittests/media/client/main/mediaPipeline/MediaPipelineProxyTest.cpp
@@ -100,8 +100,9 @@ TEST_F(RialtoClientMediaPipelineProxyTest, TestPassthrough)
 
     /////////////////////////////////////////////
 
-    EXPECT_CALL(*mediaPipelineMock, play()).WillOnce(Return(true));
-    EXPECT_TRUE(proxy->play());
+    bool async{false};
+    EXPECT_CALL(*mediaPipelineMock, play(_)).WillOnce(Return(true));
+    EXPECT_TRUE(proxy->play(async));
 
     /////////////////////////////////////////////
 
diff --git a/tests/unittests/media/client/main/mediaPipeline/PlayPauseTest.cpp b/tests/unittests/media/client/main/mediaPipeline/PlayPauseTest.cpp
index a58b80891..8c78c550f 100644
--- a/tests/unittests/media/client/main/mediaPipeline/PlayPauseTest.cpp
+++ b/tests/unittests/media/client/main/mediaPipeline/PlayPauseTest.cpp
@@ -42,9 +42,10 @@ class RialtoClientMediaPipelinePlayPauseTest : public MediaPipelineTestBase
  */
 TEST_F(RialtoClientMediaPipelinePlayPauseTest, PlaySuccess)
 {
-    EXPECT_CALL(*m_mediaPipelineIpcMock, play()).WillOnce(Return(true));
+    bool async{false};
+    EXPECT_CALL(*m_mediaPipelineIpcMock, play(_)).WillOnce(Return(true));
 
-    EXPECT_EQ(m_mediaPipeline->play(), true);
+    EXPECT_EQ(m_mediaPipeline->play(async), true);
 }
 
 /**
@@ -52,9 +53,10 @@ TEST_F(RialtoClientMediaPipelinePlayPauseTest, PlaySuccess)
  */
 TEST_F(RialtoClientMediaPipelinePlayPauseTest, PlayFailure)
 {
-    EXPECT_CALL(*m_mediaPipelineIpcMock, play()).WillOnce(Return(false));
+    bool async{false};
+    EXPECT_CALL(*m_mediaPipelineIpcMock, play(_)).WillOnce(Return(false));
 
-    EXPECT_EQ(m_mediaPipeline->play(), false);
+    EXPECT_EQ(m_mediaPipeline->play(async), false);
 }
 
 /**
diff --git a/tests/unittests/media/client/mocks/ipc/MediaPipelineIpcMock.h b/tests/unittests/media/client/mocks/ipc/MediaPipelineIpcMock.h
index ed99bfb8e..32e72ba2c 100644
--- a/tests/unittests/media/client/mocks/ipc/MediaPipelineIpcMock.h
+++ b/tests/unittests/media/client/mocks/ipc/MediaPipelineIpcMock.h
@@ -39,7 +39,7 @@ class MediaPipelineIpcMock : public IMediaPipelineIpc
     MOCK_METHOD(bool, allSourcesAttached, (), (override));
     MOCK_METHOD(bool, load, (MediaType type, const std::string &mimeType, const std::string &url), (override));
     MOCK_METHOD(bool, setVideoWindow, (uint32_t x, uint32_t y, uint32_t width, uint32_t height), (override));
-    MOCK_METHOD(bool, play, (), (override));
+    MOCK_METHOD(bool, play, (bool &async), (override));
     MOCK_METHOD(bool, pause, (), (override));
     MOCK_METHOD(bool, stop, (), (override));
     MOCK_METHOD(bool, haveData, (MediaSourceStatus status, uint32_t numFrames, uint32_t requestId), (override));
diff --git a/tests/unittests/media/client/mocks/main/MediaPipelineAndControlClientMock.h b/tests/unittests/media/client/mocks/main/MediaPipelineAndControlClientMock.h
index 0d1427fd4..c69140210 100644
--- a/tests/unittests/media/client/mocks/main/MediaPipelineAndControlClientMock.h
+++ b/tests/unittests/media/client/mocks/main/MediaPipelineAndControlClientMock.h
@@ -39,7 +39,7 @@ class MediaPipelineAndControlClientMock : public IMediaPipelineAndIControlClient
 
     MOCK_METHOD(bool, allSourcesAttached, (), (override));
 
-    MOCK_METHOD(bool, play, (), (override));
+    MOCK_METHOD(bool, play, (bool &async), (override));
     MOCK_METHOD(bool, pause, (), (override));
     MOCK_METHOD(bool, stop, (), (override));
 
diff --git a/tests/unittests/media/server/gstplayer/genericPlayer/GstGenericPlayerTest.cpp b/tests/unittests/media/server/gstplayer/genericPlayer/GstGenericPlayerTest.cpp
index b2c5158b6..97a5e0df6 100644
--- a/tests/unittests/media/server/gstplayer/genericPlayer/GstGenericPlayerTest.cpp
+++ b/tests/unittests/media/server/gstplayer/genericPlayer/GstGenericPlayerTest.cpp
@@ -165,13 +165,40 @@ TEST_F(GstGenericPlayerTest, shouldAllSourcesAttached)
     m_sut->allSourcesAttached();
 }
 
-TEST_F(GstGenericPlayerTest, shouldPlay)
+TEST_F(GstGenericPlayerTest, shouldPlayOnWorkerThread)
 {
+    // Pause first
+    std::unique_ptr<IPlayerTask> pauseTask{std::make_unique<StrictMock<PlayerTaskMock>>()};
+    EXPECT_CALL(dynamic_cast<StrictMock<PlayerTaskMock> &>(*pauseTask), execute());
+    EXPECT_CALL(m_taskFactoryMock, createPause(_, _)).WillOnce(Return(ByMove(std::move(pauseTask))));
+
+    m_sut->pause();
+
+    // ...
+
+    bool async = false;
     std::unique_ptr<IPlayerTask> task{std::make_unique<StrictMock<PlayerTaskMock>>()};
     EXPECT_CALL(dynamic_cast<StrictMock<PlayerTaskMock> &>(*task), execute());
     EXPECT_CALL(m_taskFactoryMock, createPlay(_)).WillOnce(Return(ByMove(std::move(task))));
 
-    m_sut->play();
+    m_sut->play(async);
+    EXPECT_TRUE(async);
+}
+
+TEST_F(GstGenericPlayerTest, shouldPlayImmediatelySynchronously)
+{
+    bool async = false;
+    EXPECT_CALL(*m_gstWrapperMock, gstElementSetState(_, GST_STATE_PLAYING)).WillOnce(Return(GST_STATE_CHANGE_SUCCESS));
+    m_sut->play(async);
+    EXPECT_FALSE(async);
+}
+
+TEST_F(GstGenericPlayerTest, shouldPlayImmediatelyAsynchronously)
+{
+    bool async = false;
+    EXPECT_CALL(*m_gstWrapperMock, gstElementSetState(_, GST_STATE_PLAYING)).WillOnce(Return(GST_STATE_CHANGE_ASYNC));
+    m_sut->play(async);
+    EXPECT_TRUE(async);
 }
 
 TEST_F(GstGenericPlayerTest, shouldPause)
diff --git a/tests/unittests/media/server/gstplayer/genericPlayer/common/GenericTasksTestsBase.cpp b/tests/unittests/media/server/gstplayer/genericPlayer/common/GenericTasksTestsBase.cpp
index f40976337..87ddcf090 100644
--- a/tests/unittests/media/server/gstplayer/genericPlayer/common/GenericTasksTestsBase.cpp
+++ b/tests/unittests/media/server/gstplayer/genericPlayer/common/GenericTasksTestsBase.cpp
@@ -2273,7 +2273,7 @@ void GenericTasksTestsBase::shouldStopGstPlayer()
     videoStreamIt->second.isDataNeeded = true;
     audioStreamIt->second.isDataNeeded = true;
     EXPECT_CALL(testContext->m_gstPlayer, stopPositionReportingAndCheckAudioUnderflowTimer());
-    EXPECT_CALL(testContext->m_gstPlayer, changePipelineState(GST_STATE_NULL));
+    EXPECT_CALL(testContext->m_gstPlayer, changePipelineState(GST_STATE_NULL)).WillOnce(Return(GST_STATE_CHANGE_SUCCESS));
 }
 
 void GenericTasksTestsBase::triggerStop()
@@ -2589,12 +2589,12 @@ void GenericTasksTestsBase::checkNoEos()
 
 void GenericTasksTestsBase::shouldChangeStatePlayingSuccess()
 {
-    EXPECT_CALL(testContext->m_gstPlayer, changePipelineState(GST_STATE_PLAYING)).WillOnce(Return(true));
+    EXPECT_CALL(testContext->m_gstPlayer, changePipelineState(GST_STATE_PLAYING)).WillOnce(Return(GST_STATE_CHANGE_SUCCESS));
 }
 
 void GenericTasksTestsBase::shouldChangeStatePlayingFailure()
 {
-    EXPECT_CALL(testContext->m_gstPlayer, changePipelineState(GST_STATE_PLAYING)).WillOnce(Return(false));
+    EXPECT_CALL(testContext->m_gstPlayer, changePipelineState(GST_STATE_PLAYING)).WillOnce(Return(GST_STATE_CHANGE_FAILURE));
 }
 
 void GenericTasksTestsBase::triggerPlay()
@@ -2612,7 +2612,7 @@ void GenericTasksTestsBase::triggerPing()
 void GenericTasksTestsBase::shouldPause()
 {
     EXPECT_CALL(testContext->m_gstPlayer, stopPositionReportingAndCheckAudioUnderflowTimer());
-    EXPECT_CALL(testContext->m_gstPlayer, changePipelineState(GST_STATE_PAUSED));
+    EXPECT_CALL(testContext->m_gstPlayer, changePipelineState(GST_STATE_PAUSED)).WillOnce(Return(GST_STATE_CHANGE_SUCCESS));
 }
 
 void GenericTasksTestsBase::triggerPause()
diff --git a/tests/unittests/media/server/ipc/mediaPipelineModuleService/MediaPipelineModuleServiceTestsFixture.cpp b/tests/unittests/media/server/ipc/mediaPipelineModuleService/MediaPipelineModuleServiceTestsFixture.cpp
index ac3576a74..31ec98768 100644
--- a/tests/unittests/media/server/ipc/mediaPipelineModuleService/MediaPipelineModuleServiceTestsFixture.cpp
+++ b/tests/unittests/media/server/ipc/mediaPipelineModuleService/MediaPipelineModuleServiceTestsFixture.cpp
@@ -388,13 +388,13 @@ void MediaPipelineModuleServiceTests::mediaPipelineServiceWillFailAllSourcesAtta
 void MediaPipelineModuleServiceTests::mediaPipelineServiceWillPlay()
 {
     expectRequestSuccess();
-    EXPECT_CALL(m_mediaPipelineServiceMock, play(kHardcodedSessionId)).WillOnce(Return(true));
+    EXPECT_CALL(m_mediaPipelineServiceMock, play(kHardcodedSessionId, _)).WillOnce(Return(true));
 }
 
 void MediaPipelineModuleServiceTests::mediaPipelineServiceWillFailToPlay()
 {
     expectRequestFailure();
-    EXPECT_CALL(m_mediaPipelineServiceMock, play(kHardcodedSessionId)).WillOnce(Return(false));
+    EXPECT_CALL(m_mediaPipelineServiceMock, play(kHardcodedSessionId, _)).WillOnce(Return(false));
 }
 
 void MediaPipelineModuleServiceTests::mediaPipelineServiceWillPause()
diff --git a/tests/unittests/media/server/main/mediaPipeline/MiscellaneousFunctionsTest.cpp b/tests/unittests/media/server/main/mediaPipeline/MiscellaneousFunctionsTest.cpp
index ce00bdee8..aa4f3e2f3 100644
--- a/tests/unittests/media/server/main/mediaPipeline/MiscellaneousFunctionsTest.cpp
+++ b/tests/unittests/media/server/main/mediaPipeline/MiscellaneousFunctionsTest.cpp
@@ -43,11 +43,12 @@ class RialtoServerMediaPipelineMiscellaneousFunctionsTest : public MediaPipeline
  */
 TEST_F(RialtoServerMediaPipelineMiscellaneousFunctionsTest, PlaySuccess)
 {
+    bool async{false};
     loadGstPlayer();
-    mainThreadWillEnqueueTaskAndWait();
+    mainThreadWillEnqueuePriorityTaskAndWait();
 
-    EXPECT_CALL(*m_gstPlayerMock, play());
-    EXPECT_TRUE(m_mediaPipeline->play());
+    EXPECT_CALL(*m_gstPlayerMock, play(_));
+    EXPECT_TRUE(m_mediaPipeline->play(async));
 }
 
 /**
@@ -55,8 +56,9 @@ TEST_F(RialtoServerMediaPipelineMiscellaneousFunctionsTest, PlaySuccess)
  */
 TEST_F(RialtoServerMediaPipelineMiscellaneousFunctionsTest, PlayFailureDueToUninitializedPlayer)
 {
-    mainThreadWillEnqueueTaskAndWait();
-    EXPECT_FALSE(m_mediaPipeline->play());
+    bool async{false};
+    mainThreadWillEnqueuePriorityTaskAndWait();
+    EXPECT_FALSE(m_mediaPipeline->play(async));
 }
 
 /**
diff --git a/tests/unittests/media/server/main/mediaPipeline/base/MediaPipelineTestBase.cpp b/tests/unittests/media/server/main/mediaPipeline/base/MediaPipelineTestBase.cpp
index 491aec0e1..1543184af 100644
--- a/tests/unittests/media/server/main/mediaPipeline/base/MediaPipelineTestBase.cpp
+++ b/tests/unittests/media/server/main/mediaPipeline/base/MediaPipelineTestBase.cpp
@@ -82,6 +82,13 @@ void MediaPipelineTestBase::mainThreadWillEnqueueTaskAndWait()
         .RetiresOnSaturation();
 }
 
+void MediaPipelineTestBase::mainThreadWillEnqueuePriorityTaskAndWait()
+{
+    EXPECT_CALL(*m_mainThreadMock, enqueuePriorityTaskAndWait(m_kMainThreadClientId, _))
+        .WillOnce(Invoke([](uint32_t clientId, firebolt::rialto::server::IMainThread::Task task) { task(); }))
+        .RetiresOnSaturation();
+}
+
 void MediaPipelineTestBase::loadGstPlayer()
 {
     mainThreadWillEnqueueTaskAndWait();
diff --git a/tests/unittests/media/server/main/mediaPipeline/base/MediaPipelineTestBase.h b/tests/unittests/media/server/main/mediaPipeline/base/MediaPipelineTestBase.h
index d31474d53..893353141 100644
--- a/tests/unittests/media/server/main/mediaPipeline/base/MediaPipelineTestBase.h
+++ b/tests/unittests/media/server/main/mediaPipeline/base/MediaPipelineTestBase.h
@@ -90,6 +90,7 @@ class MediaPipelineTestBase : public ::testing::Test
     void destroyMediaPipeline();
     void mainThreadWillEnqueueTask();
     void mainThreadWillEnqueueTaskAndWait();
+    void mainThreadWillEnqueuePriorityTaskAndWait();
     void loadGstPlayer();
     int attachSource(MediaSourceType sourceType, const std::string &mimeType);
     void setEos(MediaSourceType sourceType);
diff --git a/tests/unittests/media/server/mocks/gstplayer/GstGenericPlayerMock.h b/tests/unittests/media/server/mocks/gstplayer/GstGenericPlayerMock.h
index de4697646..bc2c3f07f 100644
--- a/tests/unittests/media/server/mocks/gstplayer/GstGenericPlayerMock.h
+++ b/tests/unittests/media/server/mocks/gstplayer/GstGenericPlayerMock.h
@@ -36,7 +36,7 @@ class GstGenericPlayerMock : public IGstGenericPlayer
     MOCK_METHOD(void, attachSource, (const std::unique_ptr<IMediaPipeline::MediaSource> &mediaSource), (override));
     MOCK_METHOD(void, removeSource, (const MediaSourceType &mediaSourceType), (override));
     MOCK_METHOD(void, allSourcesAttached, (), (override));
-    MOCK_METHOD(void, play, (), (override));
+    MOCK_METHOD(void, play, (bool &async), (override));
     MOCK_METHOD(void, pause, (), (override));
     MOCK_METHOD(void, stop, (), (override));
     MOCK_METHOD(void, attachSamples, (const IMediaPipeline::MediaSegmentVector &mediaSegments), (override));
diff --git a/tests/unittests/media/server/mocks/gstplayer/GstGenericPlayerPrivateMock.h b/tests/unittests/media/server/mocks/gstplayer/GstGenericPlayerPrivateMock.h
index ceab057ff..e1f4b3efb 100644
--- a/tests/unittests/media/server/mocks/gstplayer/GstGenericPlayerPrivateMock.h
+++ b/tests/unittests/media/server/mocks/gstplayer/GstGenericPlayerPrivateMock.h
@@ -55,7 +55,7 @@ class GstGenericPlayerPrivateMock : public IGstGenericPlayerPrivate
     MOCK_METHOD(void, updateVideoCaps,
                 (int32_t width, int32_t height, Fraction frameRate, const std::shared_ptr<CodecData> &codecData),
                 (override));
-    MOCK_METHOD(bool, changePipelineState, (GstState newState), (override));
+    MOCK_METHOD(GstStateChangeReturn, changePipelineState, (GstState newState), (override));
     MOCK_METHOD(int64_t, getPosition, (GstElement * element), (override));
     MOCK_METHOD(void, startPositionReportingAndCheckAudioUnderflowTimer, (), (override));
     MOCK_METHOD(void, stopPositionReportingAndCheckAudioUnderflowTimer, (), (override));
diff --git a/tests/unittests/media/server/mocks/main/MediaPipelineServerInternalMock.h b/tests/unittests/media/server/mocks/main/MediaPipelineServerInternalMock.h
index 61ee32b61..27a12a686 100644
--- a/tests/unittests/media/server/mocks/main/MediaPipelineServerInternalMock.h
+++ b/tests/unittests/media/server/mocks/main/MediaPipelineServerInternalMock.h
@@ -36,7 +36,7 @@ class MediaPipelineServerInternalMock : public IMediaPipelineServerInternal
     MOCK_METHOD(bool, attachSource, (const std::unique_ptr<MediaSource> &source), (override));
     MOCK_METHOD(bool, removeSource, (int32_t id), (override));
     MOCK_METHOD(bool, allSourcesAttached, (), (override));
-    MOCK_METHOD(bool, play, (), (override));
+    MOCK_METHOD(bool, play, (bool &async), (override));
     MOCK_METHOD(bool, pause, (), (override));
     MOCK_METHOD(bool, stop, (), (override));
     MOCK_METHOD(bool, setPlaybackRate, (double rate), (override));
diff --git a/tests/unittests/media/server/mocks/service/MediaPipelineServiceMock.h b/tests/unittests/media/server/mocks/service/MediaPipelineServiceMock.h
index 69812124d..f7b226777 100644
--- a/tests/unittests/media/server/mocks/service/MediaPipelineServiceMock.h
+++ b/tests/unittests/media/server/mocks/service/MediaPipelineServiceMock.h
@@ -38,7 +38,7 @@ class MediaPipelineServiceMock : public IMediaPipelineService
     MOCK_METHOD(bool, attachSource, (int, const std::unique_ptr<IMediaPipeline::MediaSource> &), (override));
     MOCK_METHOD(bool, removeSource, (int, std::int32_t), (override));
     MOCK_METHOD(bool, allSourcesAttached, (int), (override));
-    MOCK_METHOD(bool, play, (int), (override));
+    MOCK_METHOD(bool, play, (int, bool &), (override));
     MOCK_METHOD(bool, pause, (int), (override));
     MOCK_METHOD(bool, stop, (int), (override));
     MOCK_METHOD(bool, setPlaybackRate, (int, double), (override));
diff --git a/tests/unittests/media/server/service/mediaPipelineService/MediaPipelineServiceTestsFixture.cpp b/tests/unittests/media/server/service/mediaPipelineService/MediaPipelineServiceTestsFixture.cpp
index 9b9e441dd..421cb1d8b 100644
--- a/tests/unittests/media/server/service/mediaPipelineService/MediaPipelineServiceTestsFixture.cpp
+++ b/tests/unittests/media/server/service/mediaPipelineService/MediaPipelineServiceTestsFixture.cpp
@@ -138,12 +138,12 @@ void MediaPipelineServiceTests::mediaPipelineWillFailToAllSourcesAttached()
 
 void MediaPipelineServiceTests::mediaPipelineWillPlay()
 {
-    EXPECT_CALL(m_mediaPipelineMock, play()).WillOnce(Return(true));
+    EXPECT_CALL(m_mediaPipelineMock, play(_)).WillOnce(Return(true));
 }
 
 void MediaPipelineServiceTests::mediaPipelineWillFailToPlay()
 {
-    EXPECT_CALL(m_mediaPipelineMock, play()).WillOnce(Return(false));
+    EXPECT_CALL(m_mediaPipelineMock, play(_)).WillOnce(Return(false));
 }
 
 void MediaPipelineServiceTests::mediaPipelineWillPause()
@@ -624,12 +624,14 @@ void MediaPipelineServiceTests::allSourcesAttachedShouldFail()
 
 void MediaPipelineServiceTests::playShouldSucceed()
 {
-    EXPECT_TRUE(m_sut->play(kSessionId));
+    bool isAsync{false};
+    EXPECT_TRUE(m_sut->play(kSessionId, isAsync));
 }
 
 void MediaPipelineServiceTests::playShouldFail()
 {
-    EXPECT_FALSE(m_sut->play(kSessionId));
+    bool isAsync{false};
+    EXPECT_FALSE(m_sut->play(kSessionId, isAsync));
 }
 
 void MediaPipelineServiceTests::pauseShouldSucceed()