diff --git a/bin/app/data/ApplicationSettings_template.xml b/bin/app/data/ApplicationSettings_template.xml
index b37a3891..0a9838f4 100644
--- a/bin/app/data/ApplicationSettings_template.xml
+++ b/bin/app/data/ApplicationSettings_template.xml
@@ -9,8 +9,6 @@
 <config>
 	<StartupProject><!-- STRING: path to project settings xml file --></StartupProject>
 
-	<FilterUndefinedNodesFromGraph><!-- BOOL: filter out undefined nodes in graph --></FilterUndefinedNodesFromGraph>
-
 	<source>
 		<CompilerFlags>
 			<CompilerFlag><!-- STRING: compiler flag, including the dash e.g. -v --></CompilerFlag>
diff --git a/src/lib/data/Storage.cpp b/src/lib/data/Storage.cpp
index aed4080b..1b447fda 100644
--- a/src/lib/data/Storage.cpp
+++ b/src/lib/data/Storage.cpp
@@ -867,32 +867,6 @@ std::shared_ptr<Graph> Storage::getGraphForActiveTokenIds(const std::vector<Id>&
 		}
 	}
 
-	if (ApplicationSettings::getInstance()->filterUndefinedNodesFromGraph())
-	{
-		bool allUndefined = true;
-		Node::NodeTypeMask undefinedMask =
-			Node::NODE_UNDEFINED | Node::NODE_UNDEFINED_TYPE |
-			Node::NODE_UNDEFINED_VARIABLE | Node::NODE_UNDEFINED_FUNCTION;
-		for (Id tokenId : tokenIds)
-		{
-			Token* token = m_graph.getTokenById(tokenId);
-			if (token && token->isNode() && !dynamic_cast<Node*>(token)->isType(undefinedMask))
-			{
-				allUndefined = false;
-				break;
-			}
-		}
-
-		if (!allUndefined)
-		{
-			QueryTree tree("!'undefined'");
-			std::shared_ptr<Graph> outGraph = std::make_shared<Graph>();
-
-			GraphFilterConductor().filter(&tree, graph.get(), outGraph.get());
-			return outGraph;
-		}
-	}
-
 	return graph;
 }
 
diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp
index 0d60b948..d3f848e5 100644
--- a/src/lib/settings/ApplicationSettings.cpp
+++ b/src/lib/settings/ApplicationSettings.cpp
@@ -21,11 +21,6 @@ std::string ApplicationSettings::getStartupProjectFilePath() const
 	return getValue<std::string>("StartupProject", "");
 }
 
-bool ApplicationSettings::filterUndefinedNodesFromGraph() const
-{
-	return getValue<bool>("FilterUndefinedNodesFromGraph", false);
-}
-
 std::string ApplicationSettings::getFontName() const
 {
 	return getValue<std::string>("application/font_name", "Source Code Pro");
diff --git a/src/lib/settings/ApplicationSettings.h b/src/lib/settings/ApplicationSettings.h
index 75fa0c8d..4f029490 100644
--- a/src/lib/settings/ApplicationSettings.h
+++ b/src/lib/settings/ApplicationSettings.h
@@ -13,7 +13,6 @@ public:
 	~ApplicationSettings();
 
 	std::string getStartupProjectFilePath() const;
-	bool filterUndefinedNodesFromGraph() const;
 
 	// application
 	std::string getFontName() const;