diff --git a/api/views.py b/api/views.py
index 5aa5f87..69da2a2 100644
--- a/api/views.py
+++ b/api/views.py
@@ -2,15 +2,12 @@ import json
 
 from uuid import uuid4
 
-from django.conf import settings
 from django.urls import reverse_lazy
 from django.http import JsonResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
-from django.core.exceptions import ValidationError
 from django_tables2 import SingleTableView
-from django.views.generic.base import View
 from django.views.generic.edit import (
     CreateView,
     DeleteView,
@@ -21,7 +18,6 @@ from utils.save_snapshots import move_json, save_in_disk
 from dashboard.mixins import DashboardView
 from evidence.models import Annotation
 from evidence.parse import Build
-from user.models import User
 from api.models import Token
 from api.tables import TokensTable
 
@@ -79,17 +75,16 @@ def NewSnapshot(request):
 
 
     if not annotation:
-        return JsonResponse({'status': 'fail'}, status=200)
+        return JsonResponse({'status': 'fail'}, status=500)
+
+    url_args = reverse_lazy("device:details", args=(annotation.value,))
+    url = request.build_absolute_uri(url_args)
 
-    url = "{}://{}{}".format(
-        request.scheme,
-        settings.DOMAIN,
-        reverse_lazy("device:details", args=(annotation.value,))
-    )
     response = {
         "status": "success",
         "dhid": annotation.value[:6].upper(),
         "url": url,
+        # TODO replace with public_url when available
         "public_url": url
     }
     move_json(path_name, tk.owner.institution.name)