diff --git a/Anytype/Sources/PresentationLayer/Debug/FeatureFlags/FeatureFlagView.swift b/Anytype/Sources/PresentationLayer/Debug/FeatureFlags/FeatureFlagView.swift
index 069613ce4d..82a2e7f13e 100644
--- a/Anytype/Sources/PresentationLayer/Debug/FeatureFlags/FeatureFlagView.swift
+++ b/Anytype/Sources/PresentationLayer/Debug/FeatureFlags/FeatureFlagView.swift
@@ -33,7 +33,7 @@ struct FeatureFlagView: View {
             Button {
                 showDefaultValues.toggle()
             } label: {
-                Text("Default values")
+                Text("> Default values")
                     .font(AnytypeFontBuilder.font(anytypeFont: .previewTitle2Medium))
                     .foregroundColor(.Text.secondary)
             }
diff --git a/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription+Flags.swift b/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription+Flags.swift
index cadd9ae616..960e78b32f 100644
--- a/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription+Flags.swift
+++ b/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription+Flags.swift
@@ -48,8 +48,7 @@ public extension FeatureDescription {
     static let fullInlineSetImpl = FeatureDescription(
         title: "Full inline set impl (IOS-790)",
         type: .feature(author: "joe_pusya@anytype.io", releaseVersion: "?"),
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     static let dndOnCollectionsAndSets = FeatureDescription(
@@ -63,8 +62,7 @@ public extension FeatureDescription {
     static let rainbowViews = FeatureDescription(
         title: "Paint editor views 🌈",
         type: .debug,
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     static let showAlertOnAssert = FeatureDescription(
@@ -76,15 +74,13 @@ public extension FeatureDescription {
     static let analytics = FeatureDescription(
         title: "Analytics - send events to Amplitude (only for test builds)",
         type: .debug,
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     static let analyticsAlerts = FeatureDescription(
         title: "Analytics - show alerts",
         type: .debug,
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     static let nonfatalAlerts = FeatureDescription(
@@ -97,15 +93,13 @@ public extension FeatureDescription {
     static let resetTips = FeatureDescription(
         title: "Tips 💭 - reset on launch",
         type: .debug,
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     static let showAllTips = FeatureDescription(
         title: "Tips 💭 - show immediate (ignore time rules)",
         type: .debug,
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     static let sharingExtensionShowContentTypes = FeatureDescription(
@@ -125,15 +119,13 @@ public extension FeatureDescription {
     static let failReceiptValidation = FeatureDescription(
         title: "Fail receipt validaton of Memebership",
         type: .debug,
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     static let showGlobalSearchScore = FeatureDescription(
         title: "Show global search score",
         type: .debug,
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     // Pulse handles URLSession on main thread.
@@ -141,8 +133,7 @@ public extension FeatureDescription {
     static let networkHTTPSRequestsLogger = FeatureDescription(
         title: "Enable network requests logger for images and other https requests",
         type: .debug,
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     static let logMiddlewareRequests = FeatureDescription(
@@ -155,8 +146,7 @@ public extension FeatureDescription {
     static let showPushMessagesInForeground = FeatureDescription(
         title: "Show push messages in foreground",
         type: .debug,
-        defaultValue: false,
-        debugValue: false
+        defaultValue: false
     )
     
     static let skipOnboardingEmailCollection = FeatureDescription(
@@ -174,7 +164,6 @@ public extension FeatureDescription {
     static let showHangedObjects = FeatureDescription(
         title: "Show hanged objects",
         type: .debug,
-        defaultValue: false,
-        debugValue: true
+        defaultValue: false
     )
 }
diff --git a/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription.swift b/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription.swift
index 971462442f..38af2a3171 100644
--- a/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription.swift
+++ b/Modules/AnytypeCore/AnytypeCore/Utils/FeatureFlags/FeatureDescription.swift
@@ -29,17 +29,10 @@ public struct FeatureDescription: Sendable {
     public let releaseAnytypeValue: Bool
     public let debugValue: Bool
     
-    init(title: String, type: FeatureType, releaseAnytypeValue: Bool, debugValue: Bool = true) {
-        self.title = title
-        self.type = type
-        self.releaseAnytypeValue = releaseAnytypeValue
-        self.debugValue = debugValue
-    }
-    
-    init(title: String, type: FeatureType, defaultValue: Bool, debugValue: Bool = true) {
+    init(title: String, type: FeatureType, defaultValue: Bool, debugValue: Bool? = nil) {
         self.title = title
         self.type = type
         self.releaseAnytypeValue = defaultValue
-        self.debugValue = debugValue
+        self.debugValue = debugValue ?? defaultValue
     }
 }