diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index e8f46f40026..5f305abf16e 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -636,7 +636,7 @@ QLinearGradient StyleHelper::statusBarGradient(const QRect &statusBarRect)
 
 bool StyleHelper::isQDSTheme()
 {
-    return creatorTheme()->flag(Theme::QDSTheme);
+    return creatorTheme() ? creatorTheme()->flag(Theme::QDSTheme) : false;
 }
 
 QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<IconFontHelper> &parameters)
diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp
index 8221b455a3b..b8404e10b79 100644
--- a/src/libs/utils/theme/theme.cpp
+++ b/src/libs/utils/theme/theme.cpp
@@ -91,6 +91,9 @@ Theme::Theme(Theme *originTheme, QObject *parent)
 
 Theme::~Theme()
 {
+    if (this == m_creatorTheme)
+        m_creatorTheme = nullptr;
+
     delete d;
 }