diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c
index b5f371f85..d1d556937 100644
--- a/client/Wayland/wlfreerdp.c
+++ b/client/Wayland/wlfreerdp.c
@@ -32,7 +32,6 @@
 #include <freerdp/client.h>
 #include <freerdp/utils/signal.h>
 #include <freerdp/locale/keyboard.h>
-#include <freerdp/utils/smartcard_cli.h>
 
 #include <linux/input.h>
 
@@ -708,9 +707,6 @@ int main(int argc, char* argv[])
 		if (settings->ListMonitors)
 			wlf_list_monitors(wlc);
 
-		if (settings->ListSmartcards)
-			freerdp_smartcard_list(settings);
-
 		goto fail;
 	}
 
diff --git a/client/Windows/cli/wfreerdp.c b/client/Windows/cli/wfreerdp.c
index 10fd2f378..1ad68edeb 100644
--- a/client/Windows/cli/wfreerdp.c
+++ b/client/Windows/cli/wfreerdp.c
@@ -34,7 +34,6 @@
 #include <freerdp/client/cmdline.h>
 #include <freerdp/client/channels.h>
 #include <freerdp/channels/channels.h>
-#include <freerdp/utils/smartcard_cli.h>
 
 #include "../resource/resource.h"
 
@@ -107,10 +106,6 @@ INT WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	if (status)
 	{
 		ret = freerdp_client_settings_command_line_status_print(settings, status, argc, argv);
-
-		if (settings->ListSmartcards)
-			freerdp_smartcard_list(settings);
-
 		goto out;
 	}
 
diff --git a/client/X11/cli/xfreerdp.c b/client/X11/cli/xfreerdp.c
index 54bea838d..aa9ac4b48 100644
--- a/client/X11/cli/xfreerdp.c
+++ b/client/X11/cli/xfreerdp.c
@@ -29,7 +29,6 @@
 #include <freerdp/streamdump.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/client/cmdline.h>
-#include <freerdp/utils/smartcard_cli.h>
 
 #include "../xf_client.h"
 #include "../xfreerdp.h"
@@ -65,9 +64,6 @@ int main(int argc, char* argv[])
 		if (settings->ListMonitors)
 			xf_list_monitors(xfc);
 
-		if (settings->ListSmartcards)
-			freerdp_smartcard_list(settings);
-
 		goto out;
 	}
 
diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 8a2daa10e..5d6b13515 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -54,6 +54,7 @@
 
 #include <freerdp/client/cmdline.h>
 #include <freerdp/version.h>
+#include <freerdp/utils/smartcard_cli.h>
 
 #include "cmdline.h"
 
@@ -1373,7 +1374,7 @@ int freerdp_client_settings_command_line_status_print_ex(rdpSettings* settings,
 		arg = CommandLineFindArgumentA(largs, "smartcard-list");
 		if (arg->Flags & COMMAND_LINE_VALUE_PRESENT)
 		{
-			settings->ListSmartcards = TRUE;
+			freerdp_smartcard_list(settings);
 		}
 
 		arg = CommandLineFindArgumentA(largs, "kbd-scancode-list");
@@ -1872,10 +1873,6 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
 		{
 			settings->ListMonitors = enable;
 		}
-		CommandLineSwitchCase(arg, "smartcard-list")
-		{
-			settings->ListSmartcards = enable;
-		}
 		CommandLineSwitchCase(arg, "t")
 		{
 			if (!freerdp_settings_set_string(settings, FreeRDP_WindowTitle, arg->Value))
diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h
index bd181bafa..2ea5701a2 100644
--- a/include/freerdp/settings.h
+++ b/include/freerdp/settings.h
@@ -673,7 +673,6 @@ typedef struct
 #define FreeRDP_ContainerName (1296)
 #define FreeRDP_CspName (1297)
 #define FreeRDP_PkinitAnchors (1298)
-#define FreeRDP_ListSmartcards (1299)
 #define FreeRDP_KerberosKdc (1344)
 #define FreeRDP_KerberosRealm (1345)
 #define FreeRDP_KerberosStartTime (1346)
@@ -1174,8 +1173,7 @@ struct rdp_settings
 	ALIGN64 char* ContainerName;            /* 1296 */
 	ALIGN64 char* CspName;                  /* 1297 */
 	ALIGN64 char* PkinitAnchors;            /* 1298 */
-	ALIGN64 BOOL ListSmartcards;            /* 1299 */
-	UINT64 padding1344[1344 - 1300];        /* 1300 */
+	UINT64 padding1344[1344 - 1299];        /* 1299 */
 
 	/* Kerberos Authentication */
 	ALIGN64 char* KerberosKdc;               /* 1344 */
diff --git a/libfreerdp/common/settings_getters.c b/libfreerdp/common/settings_getters.c
index 2a793e323..1bab14faa 100644
--- a/libfreerdp/common/settings_getters.c
+++ b/libfreerdp/common/settings_getters.c
@@ -291,9 +291,6 @@ BOOL freerdp_settings_get_bool(const rdpSettings* settings, size_t id)
 		case FreeRDP_ListMonitors:
 			return settings->ListMonitors;
 
-		case FreeRDP_ListSmartcards:
-			return settings->ListSmartcards;
-
 		case FreeRDP_LocalConnection:
 			return settings->LocalConnection;
 
@@ -923,10 +920,6 @@ BOOL freerdp_settings_set_bool(rdpSettings* settings, size_t id, BOOL val)
 			settings->ListMonitors = cnv.c;
 			break;
 
-		case FreeRDP_ListSmartcards:
-			settings->ListSmartcards = cnv.c;
-			break;
-
 		case FreeRDP_LocalConnection:
 			settings->LocalConnection = cnv.c;
 			break;
diff --git a/libfreerdp/common/settings_str.c b/libfreerdp/common/settings_str.c
index e3e5fe271..760d0662c 100644
--- a/libfreerdp/common/settings_str.c
+++ b/libfreerdp/common/settings_str.c
@@ -100,7 +100,6 @@ static const struct settings_str_entry settings_map[] = {
 	{ FreeRDP_IgnoreCertificate, 0, "FreeRDP_IgnoreCertificate" },
 	{ FreeRDP_JpegCodec, 0, "FreeRDP_JpegCodec" },
 	{ FreeRDP_ListMonitors, 0, "FreeRDP_ListMonitors" },
-	{ FreeRDP_ListSmartcards, 0, "FreeRDP_ListSmartcards" },
 	{ FreeRDP_LocalConnection, 0, "FreeRDP_LocalConnection" },
 	{ FreeRDP_LogonErrors, 0, "FreeRDP_LogonErrors" },
 	{ FreeRDP_LogonNotify, 0, "FreeRDP_LogonNotify" },
diff --git a/libfreerdp/core/test/settings_property_lists.h b/libfreerdp/core/test/settings_property_lists.h
index 38533dcca..f80875655 100644
--- a/libfreerdp/core/test/settings_property_lists.h
+++ b/libfreerdp/core/test/settings_property_lists.h
@@ -89,7 +89,6 @@ static const size_t bool_list_indices[] = {
 	FreeRDP_IgnoreCertificate,
 	FreeRDP_JpegCodec,
 	FreeRDP_ListMonitors,
-	FreeRDP_ListSmartcards,
 	FreeRDP_LocalConnection,
 	FreeRDP_LogonErrors,
 	FreeRDP_LogonNotify,