diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index a8a59668f7..0ee93e8768 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -3026,9 +3026,7 @@ BView::EndPicture()
 		}
 	}
 
-	// TODO: Was NULL. We might revert when there is BPictures support
-	// in the app-server. For now this allows to avoid hangs with BPictureButtons
-	return cpicture;
+	return NULL;
 }