diff --git a/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java b/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java
index b17b33094..3d3c6d83a 100644
--- a/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java
+++ b/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java
@@ -70,7 +70,9 @@ public class SyndHandler extends DefaultHandler {
 
 	@Override
 	public void endPrefixMapping(String prefix) throws SAXException {
-		// TODO remove Namespace
+		if (state.defaultNamespaces.size() > 1 && prefix.equals(DEFAULT_PREFIX)) {
+			state.defaultNamespaces.pop();
+		}
 	}
 
 	@Override
diff --git a/tests/src/de/danoeh/antennapod/test/FeedHandlerTest.java b/tests/src/de/danoeh/antennapod/test/FeedHandlerTest.java
index 957a2babc..747ac623b 100644
--- a/tests/src/de/danoeh/antennapod/test/FeedHandlerTest.java
+++ b/tests/src/de/danoeh/antennapod/test/FeedHandlerTest.java
@@ -24,6 +24,7 @@ public class FeedHandlerTest extends AndroidTestCase {
 	private static final String FEEDS_DIR = "testfeeds";
 
 	private static final String[] urls = {
+			"http://www.blacksweetstories.com/feed/podcast/",
 			"http://bitlove.org/ranzzeit/ranz/feed",
 			"http://bitlove.org/importthis/mp3/feed",
 			"http://bitlove.org/astro/youtube/feed",