diff --git a/fhem/contrib/HMCCU/FHEM/88_HMCCU.pm b/fhem/contrib/HMCCU/FHEM/88_HMCCU.pm
index 11cad60a4..9130e2616 100644
--- a/fhem/contrib/HMCCU/FHEM/88_HMCCU.pm
+++ b/fhem/contrib/HMCCU/FHEM/88_HMCCU.pm
@@ -57,7 +57,7 @@ my %HMCCU_CUST_CHN_DEFAULTS;
 my %HMCCU_CUST_DEV_DEFAULTS;
 
 # HMCCU version
-my $HMCCU_VERSION = '5.0 212921914';
+my $HMCCU_VERSION = '5.0 212941907';
 
 # Timeout for CCU requests (seconds)
 my $HMCCU_TIMEOUT_REQUEST = 4;
@@ -6860,10 +6860,16 @@ sub HMCCU_UpdateRoleCommands ($$;$)
 						}
 					}
 				}
+				else {
+					if (!HMCCU_IsValidParameter ($clHash, "$addr:$cmdChn", $psName, $dpt, $parAccess)) {
+						HMCCU_Log ($clHash, 4, "Invalid parameter $addr:$cmdChn $psName $dpt $parAccess");
+						next URCSUB;
+					}
+				}
 				
 				my $paramDef = HMCCU_GetParamDef ($ioHash, "$addr:$cmdChn", $psName, $dpt);
 				if (!defined($paramDef)) {
-					HMCCU_Log ($ioHash, 3, "INFO: Can't get definition of datapoint $addr:$cmdChn.$dpt. Ignoring command $cmd for device $clHash->{NAME}");
+					HMCCU_Log ($ioHash, 4, "INFO: Can't get definition of datapoint $addr:$cmdChn.$dpt. Ignoring command $cmd for device $clHash->{NAME}");
 					next URCCMD;
 				}
 				$clHash->{hmccu}{roleCmds}{$cmdType}{$cmd}{subcmd}{$scn}{scn}  = sprintf("%03d", $subCmdNo);
@@ -6987,6 +6993,14 @@ sub HMCCU_UpdateRoleCommands ($$;$)
 				$parTypes[$pt]++;
 				$cnt++;
 			}
+
+			if ($cnt == 0) {
+				if (!exists($clHash->{hmccu}{roleCmds}{$cmdType}{$cmd}{subcount})) {
+					HMCCU_Log ($clHash, 4, "No datapoints found. Deleting command $cmd");
+					delete $clHash->{hmccu}{roleCmds}{$cmdType}{$cmd};
+				}
+				next URCCMD;
+			}
 			
 			if ($parTypes[1] == 1 && $parTypes[2] == 0 && $cmdArgList ne '') {
 				# Only one variable argument. Argument belongs to a predefined value list
diff --git a/fhem/contrib/HMCCU/FHEM/88_HMCCUCHN.pm b/fhem/contrib/HMCCU/FHEM/88_HMCCUCHN.pm
index 79b1d669e..a57b54ac0 100644
--- a/fhem/contrib/HMCCU/FHEM/88_HMCCUCHN.pm
+++ b/fhem/contrib/HMCCU/FHEM/88_HMCCUCHN.pm
@@ -30,7 +30,7 @@ sub HMCCUCHN_Set ($@);
 sub HMCCUCHN_Get ($@);
 sub HMCCUCHN_Attr ($@);
 
-my $HMCCUCHN_VERSION = '5.0 212921914';
+my $HMCCUCHN_VERSION = '5.0 212941907';
 
 ######################################################################
 # Initialize module
diff --git a/fhem/contrib/HMCCU/FHEM/88_HMCCUDEV.pm b/fhem/contrib/HMCCU/FHEM/88_HMCCUDEV.pm
index db3635c44..185f0b86f 100644
--- a/fhem/contrib/HMCCU/FHEM/88_HMCCUDEV.pm
+++ b/fhem/contrib/HMCCU/FHEM/88_HMCCUDEV.pm
@@ -31,7 +31,7 @@ sub HMCCUDEV_Set ($@);
 sub HMCCUDEV_Get ($@);
 sub HMCCUDEV_Attr ($@);
 
-my $HMCCUDEV_VERSION = '5.0 212921914';
+my $HMCCUDEV_VERSION = '5.0 212941907';
 
 ######################################################################
 # Initialize module
diff --git a/fhem/contrib/HMCCU/FHEM/88_HMCCURPCPROC.pm b/fhem/contrib/HMCCU/FHEM/88_HMCCURPCPROC.pm
index eeee60583..6e754c94c 100755
--- a/fhem/contrib/HMCCU/FHEM/88_HMCCURPCPROC.pm
+++ b/fhem/contrib/HMCCU/FHEM/88_HMCCURPCPROC.pm
@@ -39,7 +39,7 @@ require "$attr{global}{modpath}/FHEM/88_HMCCU.pm";
 ######################################################################
 
 # HMCCURPC version
-my $HMCCURPCPROC_VERSION = '5.0 212921914';
+my $HMCCURPCPROC_VERSION = '5.0 212941907';
 
 # Maximum number of events processed per call of Read()
 my $HMCCURPCPROC_MAX_EVENTS = 100;
diff --git a/fhem/contrib/HMCCU/controls_HMCCU.txt b/fhem/contrib/HMCCU/controls_HMCCU.txt
index 1e3b2a9ac..4d6b2aa8d 100644
--- a/fhem/contrib/HMCCU/controls_HMCCU.txt
+++ b/fhem/contrib/HMCCU/controls_HMCCU.txt
@@ -1,5 +1,5 @@
-UPD 2021-10-19_19:14:52 103909 FHEM/88_HMCCURPCPROC.pm
-UPD 2021-10-18_19:13:22 85792 FHEM/HMCCUConf.pm
-UPD 2021-10-19_19:14:52 44881 FHEM/88_HMCCUCHN.pm
-UPD 2021-10-19_19:14:52 362815 FHEM/88_HMCCU.pm
-UPD 2021-10-19_19:14:52 32541 FHEM/88_HMCCUDEV.pm
+UPD 2021-10-21_19:07:03 103909 FHEM/88_HMCCURPCPROC.pm
+UPD 2021-10-21_18:56:45 85792 FHEM/HMCCUConf.pm
+UPD 2021-10-21_19:07:03 44881 FHEM/88_HMCCUCHN.pm
+UPD 2021-10-21_19:07:03 363290 FHEM/88_HMCCU.pm
+UPD 2021-10-21_19:07:03 32541 FHEM/88_HMCCUDEV.pm