diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index f818b678a..c97cfc7b8 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -582,6 +582,11 @@ sub parse_args {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
     } elsif ($command eq "rflash") {
+        #
+        # disable function until fully supported by openbmc 
+        # Currently waiting for issue https://github.com/openbmc/openbmc/issues/2074 to be fixed
+        #
+        $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; }
         my $filename_passed = 0;
         my $updateid_passed = 0;
         my $option_flag;
@@ -1890,6 +1895,11 @@ sub rflash_response {
             }
         }
 
+        if ($activation_state =~ /Software.Activation.Activations.Failed/) {
+            # Activation failed. Report error and exit
+            xCAT::SvrUtils::sendmsg([1,"Activation of firmware failed"], $callback, $node);
+        }
+
         if ($activation_state =~ /Software.Activation.Activations.Active/) { 
             if (scalar($priority_state) == 0) {
                 # Activation state of active and priority of 0 indicates the activation has been completed