diff --git a/raven/base.py b/raven/base.py
index <HASH>..<HASH> 100644
--- a/raven/base.py
+++ b/raven/base.py
@@ -231,6 +231,8 @@ class Client(object):
         >>> # Specify a scheme to use (http or https)
         >>> print client.get_public_dsn('https')
         """
+        if not self.is_enabled():
+            return
         url = self._get_public_dsn()
         if not scheme:
             return url
diff --git a/raven/contrib/django/templatetags/raven.py b/raven/contrib/django/templatetags/raven.py
index <HASH>..<HASH> 100644
--- a/raven/contrib/django/templatetags/raven.py
+++ b/raven/contrib/django/templatetags/raven.py
@@ -16,4 +16,4 @@ register = template.Library()
 @register.simple_tag
 def sentry_public_dsn(scheme=None):
     from raven.contrib.django.models import client
-    return client.get_public_dsn(scheme)
+    return client.get_public_dsn(scheme) or ''
Dont try to return a public_dsn if Raven is disabled