diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index f1b7d1210..3efa53eba 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -20,6 +20,39 @@ namespace {
 
 uint64 InstallationTag = 0;
 
+class FilteredCommandLineArguments {
+public:
+	FilteredCommandLineArguments(int argc, char **argv);
+
+	int &count();
+	char **values();
+
+private:
+	static constexpr auto kForwardArgumentCount = 1;
+
+	int _count = 0;
+	char *_arguments[kForwardArgumentCount + 1] = { nullptr };
+
+};
+
+FilteredCommandLineArguments::FilteredCommandLineArguments(
+	int argc,
+	char **argv)
+: _count(std::clamp(argc, 0, kForwardArgumentCount)) {
+	// For now just pass only the first argument, the executable path.
+	for (auto i = 0; i != _count; ++i) {
+		_arguments[i] = argv[i];
+	}
+}
+
+int &FilteredCommandLineArguments::count() {
+	return _count;
+}
+
+char **FilteredCommandLineArguments::values() {
+	return _arguments;
+}
+
 QString DebugModeSettingPath() {
 	return cWorkingDir() + qsl("tdata/withdebug");
 }
@@ -440,7 +473,8 @@ void Launcher::processArguments() {
 }
 
 int Launcher::executeApplication() {
-	Sandbox sandbox(this, _argc, _argv);
+	FilteredCommandLineArguments arguments(_argc, _argv);
+	Sandbox sandbox(this, arguments.count(), arguments.values());
 	MainQueueProcessor processor;
 	base::ConcurrentTimerEnvironment environment;
 	return sandbox.start();
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 6b8fd9cfa..1cef35347 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -76,9 +76,9 @@ Sandbox::Sandbox(
 	not_null<Core::Launcher*> launcher,
 	int &argc,
 	char **argv)
-	: QApplication(argc, argv)
-	, _mainThreadId(QThread::currentThreadId())
-	, _launcher(launcher) {
+: QApplication(argc, argv)
+, _mainThreadId(QThread::currentThreadId())
+, _launcher(launcher) {
 }
 
 int Sandbox::start() {