diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp
index 5edc3390a6..a5d447d479 100755
--- a/libraries/controllers/src/controllers/UserInputMapper.cpp
+++ b/libraries/controllers/src/controllers/UserInputMapper.cpp
@@ -26,6 +26,7 @@
 #include "Logging.h"
 
 #include "impl/conditionals/AndConditional.h"
+#include "impl/conditionals/NotConditional.h"
 #include "impl/conditionals/EndpointConditional.h"
 #include "impl/conditionals/ScriptConditional.h"
 
@@ -838,18 +839,16 @@ Conditional::Pointer UserInputMapper::parseConditional(const QJsonValue& value)
 
         auto input = findDeviceInput(conditionalToken);
         auto endpoint = endpointFor(input);
-        if (!endpoint) {
-            return Conditional::Pointer();
-        }
+        auto conditional = std::make_shared<EndpointConditional>(endpoint);
 
         if (!conditionalModifier.isEmpty()) {
             if (conditionalModifier == JSON_CONDITIONAL_MODIFIER_NOT) {
-                return std::make_shared<NotEndpointConditional>(endpoint);
+                return std::make_shared<NotConditional>(conditional);
             }
         }
 
         // Default and conditional behavior
-        return std::make_shared<EndpointConditional>(endpoint);
+        return conditional;
     }
 
     return Conditional::parse(value);
diff --git a/libraries/controllers/src/controllers/impl/conditionals/EndpointConditional.h b/libraries/controllers/src/controllers/impl/conditionals/EndpointConditional.h
index 36fd3e5daa..0ba1347087 100644
--- a/libraries/controllers/src/controllers/impl/conditionals/EndpointConditional.h
+++ b/libraries/controllers/src/controllers/impl/conditionals/EndpointConditional.h
@@ -23,13 +23,5 @@ private:
     Endpoint::Pointer _endpoint;
 };
 
-class NotEndpointConditional : public Conditional {
-public:
-    NotEndpointConditional(Endpoint::Pointer endpoint) : _endpoint(endpoint) {}
-    virtual bool satisfied() override { return _endpoint && _endpoint->value() == 0.0; }
-private:
-    Endpoint::Pointer _endpoint;
-};
-
 }
 #endif
diff --git a/libraries/controllers/src/controllers/impl/conditionals/NotConditional.cpp b/libraries/controllers/src/controllers/impl/conditionals/NotConditional.cpp
index e30b060985..813c8ebfad 100644
--- a/libraries/controllers/src/controllers/impl/conditionals/NotConditional.cpp
+++ b/libraries/controllers/src/controllers/impl/conditionals/NotConditional.cpp
@@ -6,10 +6,16 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-// NOTE: we don't need to include this header unless/until we add additional symbols.
-//       By removing this header we prevent these warnings on windows:
-//
-//           warning LNK4221: This object file does not define any previously undefined public symbols, 
-//           so it will not be used by any link operation that consumes this library
-//
-//#include "NotConditional.h"
+
+#include "NotConditional.h"
+
+using namespace controller;
+
+bool NotConditional::satisfied() {
+    if (_operand) {
+        return (!_operand->satisfied());
+    } else {
+        return false;
+    }
+}
+
diff --git a/libraries/controllers/src/controllers/impl/conditionals/NotConditional.h b/libraries/controllers/src/controllers/impl/conditionals/NotConditional.h
index 3acda07106..6b19cf9505 100644
--- a/libraries/controllers/src/controllers/impl/conditionals/NotConditional.h
+++ b/libraries/controllers/src/controllers/impl/conditionals/NotConditional.h
@@ -12,5 +12,19 @@
 
 #include "../Conditional.h"
 
+namespace controller {
+
+    class NotConditional : public Conditional {
+    public:
+        using Pointer = std::shared_ptr<NotConditional>;
+
+        NotConditional(Conditional::Pointer operand) : _operand(operand) { }
+
+        virtual bool satisfied() override;
+
+    private:
+        Conditional::Pointer _operand;
+    };
+}
 
 #endif