diff --git a/mtce/src/common/nodeClass.cpp b/mtce/src/common/nodeClass.cpp
index 51584876..da72137d 100755
--- a/mtce/src/common/nodeClass.cpp
+++ b/mtce/src/common/nodeClass.cpp
@@ -828,6 +828,7 @@ struct nodeLinkClass::node* nodeLinkClass::getEventBaseNode ( libEvent_enum requ
 
                    return ptr ;
                }
+               MTCE_FALLTHROUGH;
            }
            case VIM_HOST_DISABLED:
            case VIM_HOST_ENABLED:
@@ -841,6 +842,7 @@ struct nodeLinkClass::node* nodeLinkClass::getEventBaseNode ( libEvent_enum requ
 
                    return ptr ;
                }
+               MTCE_FALLTHROUGH;
            }
            case BARBICAN_GET_SECRET:
            case BARBICAN_READ_SECRET:
diff --git a/mtce/src/common/nodeClass.h b/mtce/src/common/nodeClass.h
index 6edbc2f0..81c57b27 100755
--- a/mtce/src/common/nodeClass.h
+++ b/mtce/src/common/nodeClass.h
@@ -25,6 +25,12 @@
 
 using namespace std;
 
+#if defined(__GNUC__) && __GNUC__ >= 7
+#define MTCE_FALLTHROUGH __attribute__ ((fallthrough));
+#else
+#define MTCE_FALLTHROUGH
+#endif
+
 /* Include base class definition header */
 #include "nodeBase.h"
 #include "hostUtil.h"     /* for ... server_code and others           */
diff --git a/mtce/src/maintenance/mtcNodeHdlrs.cpp b/mtce/src/maintenance/mtcNodeHdlrs.cpp
index b400b94a..b04006df 100755
--- a/mtce/src/maintenance/mtcNodeHdlrs.cpp
+++ b/mtce/src/maintenance/mtcNodeHdlrs.cpp
@@ -3230,6 +3230,7 @@ int nodeLinkClass::offline_handler ( struct nodeLinkClass::node * node_ptr )
 
             node_ptr->offlineStage = MTC_OFFLINE__SEND_MTCALIVE ;
             /* fall through on start */
+            MTCE_FALLTHROUGH;
         }
         case MTC_OFFLINE__SEND_MTCALIVE:
         {
@@ -3869,6 +3870,7 @@ int nodeLinkClass::reset_handler ( struct nodeLinkClass::node * node_ptr )
             }
             node_ptr->power_action_retries = MTC_RESET_ACTION_RETRY_COUNT ;
             /* the fall through is intentional */
+            MTCE_FALLTHROUGH;
         }
         case MTC_RESET__REQ_SEND:
         {
@@ -4691,6 +4693,7 @@ int nodeLinkClass::power_handler ( struct nodeLinkClass::node * node_ptr )
 
             node_ptr->power_action_retries = MTC_POWER_ACTION_RETRY_COUNT ;
             //the fall through to MTC_POWEROFF__REQ_SEND is intentional
+            MTCE_FALLTHROUGH;
         }
         case MTC_POWEROFF__REQ_SEND:
         {
@@ -4850,6 +4853,7 @@ int nodeLinkClass::power_handler ( struct nodeLinkClass::node * node_ptr )
             node_ptr->power_action_retries = MTC_POWER_ACTION_RETRY_COUNT ;
             powerStageChange ( node_ptr , MTC_POWERON__POWER_STATUS );
             //the fall through to MTC_POWERON__REQ_SEND is intentional
+            MTCE_FALLTHROUGH;
         }
         case MTC_POWERON__POWER_STATUS:
         {