diff --git a/Projects/Social-Trading/NT/Modules/Queries/Events.js b/Projects/Social-Trading/NT/Modules/Queries/Events.js
index 0565bf027..2cee66514 100644
--- a/Projects/Social-Trading/NT/Modules/Queries/Events.js
+++ b/Projects/Social-Trading/NT/Modules/Queries/Events.js
@@ -78,11 +78,9 @@ exports.newSocialTradingModulesQueriesEvents = function newSocialTradingModulesQ
                 /*
                 The context is a User Profile
                 */
-                if (emitterUserProfile !== undefined) {
-                    if (emitterUserProfile.userProfileId === thisObject.profile.userProfileId) {
-                        addToResponse(event)
-                        return
-                    }
+                if (emitterUserProfile.userProfileId === thisObject.profile.userProfileId) {
+                    addToResponse(event)
+                    return
                 }
                 if (targetUserProfile !== undefined) {
                     if (targetUserProfile.userProfileId === thisObject.profile.userProfileId) {
@@ -115,11 +113,9 @@ exports.newSocialTradingModulesQueriesEvents = function newSocialTradingModulesQ
                 /*
                 The context is a User Profile
                 */
-                if (emitterUserProfile !== undefined) {
-                    if (thisObject.profile.following.get(emitterUserProfile.userProfileId) !== undefined) {
-                        addToResponse(event)
-                        return
-                    }
+                if (thisObject.profile.following.get(emitterUserProfile.userProfileId) !== undefined) {
+                    addToResponse(event)
+                    return
                 }
                 if (targetUserProfile !== undefined) {
                     if (thisObject.profile.following.get(targetUserProfile.userProfileId) !== undefined) {