diff --git a/modules/sb/fsw/src/cfe_sb_api.c b/modules/sb/fsw/src/cfe_sb_api.c
index a157022db..1c3390d08 100644
--- a/modules/sb/fsw/src/cfe_sb_api.c
+++ b/modules/sb/fsw/src/cfe_sb_api.c
@@ -211,19 +211,8 @@ int32 CFE_SB_CreatePipe(CFE_SB_PipeId_t *PipeIdPtr, uint16 Depth, const char *Pi
         }
         PendingPipeId = CFE_RESOURCEID_UNDEFINED;
 
-        /*
-         * If there is a relevant error counter, increment it now
-         * while the global data is locked.
-         */
-        switch (PendingEventId)
-        {
-            case CFE_SB_CR_PIPE_BAD_ARG_EID:
-                ++CFE_SB_Global.HKTlmMsg.Payload.CreatePipeErrorCounter;
-                break;
-            default:
-                /* no counter */
-                break;
-        }
+        /* Increment error counter for all errors */
+        CFE_SB_Global.HKTlmMsg.Payload.CreatePipeErrorCounter++;
     }
 
     CFE_SB_UnlockSharedData(__func__, __LINE__);