diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
index 1cab5ae29..dd7779c7e 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -137,6 +137,13 @@
           '<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")',
           '../Telegram/Images.xcassets',
         ],
+      }], [ 'build_macstore', {
+        'mac_sandbox': 1,
+        'mac_sandbox_development_team': '6N38VWS5BX',
+        'product_name': 'Telegram Desktop',
+        'sources': [
+          '../Telegram/Telegram Desktop.entitlements',
+        ],
       }],
     ],
   }],
diff --git a/Telegram/gyp/telegram_mac.gypi b/Telegram/gyp/telegram_mac.gypi
index c5580f80d..0195ddb0b 100644
--- a/Telegram/gyp/telegram_mac.gypi
+++ b/Telegram/gyp/telegram_mac.gypi
@@ -193,12 +193,6 @@
         '<(libs_loc)/breakpad/src/client/mac/build/Release',
       ],
     },
-    'mac_sandbox': 1,
-    'mac_sandbox_development_team': '6N38VWS5BX',
-    'product_name': 'Telegram Desktop',
-    'sources': [
-      '../Telegram/Telegram Desktop.entitlements',
-    ],
     'defines': [
       'TDESKTOP_DISABLE_AUTOUPDATE',
       'OS_MAC_STORE',