diff --git a/examples/webengine/quicknanobrowser/ApplicationRoot.qml b/examples/webengine/quicknanobrowser/ApplicationRoot.qml
index 78defab802384daadccc347b32d9575c98b9da4b..014b556a1058cfb536c7a886d701ea11ec84bc41 100644
--- a/examples/webengine/quicknanobrowser/ApplicationRoot.qml
+++ b/examples/webengine/quicknanobrowser/ApplicationRoot.qml
@@ -55,7 +55,7 @@ QtObject {
     id: root
 
     property QtObject defaultProfile: WebEngineProfile {
-        storageName: "Default"
+        storageName: "Profile"
     }
 
     property QtObject otrProfile: WebEngineProfile {
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index 3f83977524892ca8ba7bdced30b60314b731fb64..66fea200f473ef785de72f68e917e99410ceb811 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -104,11 +104,11 @@ BrowserContextAdapter::BrowserContextAdapter(const QString &storageName)
 BrowserContextAdapter::~BrowserContextAdapter()
 {
     Q_ASSERT(!m_downloadManagerDelegate);
+    m_browserContext->ShutdownStoragePartitions();
 }
 
 void BrowserContextAdapter::shutdown()
 {
-    m_browserContext->ShutdownStoragePartitions();
     if (m_downloadManagerDelegate) {
         m_browserContext->GetDownloadManager(m_browserContext.data())->Shutdown();
         m_downloadManagerDelegate.reset();
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 9199bd10206925f59b427c6ca51cddfee399c581..99d0e38dfbfebce72760a0bc6d432f4b219a6a8f 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -348,6 +348,9 @@ WebEngineContext::WebEngineContext()
     // The Mojo local-storage is currently pretty broken and saves in $$PWD/Local\ Storage
     parsedCommandLine->AppendSwitch(switches::kDisableMojoLocalStorage);
 
+    // Shared workers are not safe until Chromium 64
+    parsedCommandLine->AppendSwitch(switches::kDisableSharedWorkers);
+
 #if defined(Q_OS_MACOS)
     // Accelerated decoding currently does not work on macOS due to issues with OpenGL Rectangle
     // texture support. See QTBUG-60002.