diff --git a/fetcher/views.py b/fetcher/views.py
index 1becf07..616b4e8 100644
--- a/fetcher/views.py
+++ b/fetcher/views.py
@@ -14,6 +14,8 @@ def search_artist(request):
     if query:
         return Response(medium.search_artist(query, limit, page))
 
+    return Response({'status': 400, 'error': 'Debe indicar una query'})
+
 
 @api_view(['GET'])
 def get_artist(request, mbid):
@@ -27,11 +29,14 @@ def get_disc(request, mbid):
 
 @api_view(['GET'])
 def search_disc(request):
-    query = request.GET.get('query', '')
     limit = int(request.GET.get('per_page', 10))
     page = int(request.GET.get('page', 1))
 
-    return Response(medium.search_disc(query, limit, page))
+    query = request.GET.get('query')
+    if query:
+        return Response(medium.search_disc(query, limit, page))
+
+    return Response({'status': 400, 'error': 'Debe indicar una query'})
 
 
 @api_view(['GET'])
@@ -57,11 +62,14 @@ def get_release(request, mbid):
 
 @api_view(['GET'])
 def search_release(request):
-    query = request.GET.get('query', '')
     limit = int(request.GET.get('per_page', 10))
     page = int(request.GET.get('page', 1))
 
-    return Response(medium.search_release(query, limit, page))
+    query = request.GET.get('query', '')
+    if query:
+        return Response(medium.search_release(query, limit, page))
+
+    return Response({'status': 400, 'error': 'Debe indicar una query'})
 
 
 @api_view(['GET'])
@@ -87,11 +95,14 @@ def get_recording(request, mbid):
 
 @api_view(['GET'])
 def search_recording(request):
-    query = request.GET.get('query', '')
     limit = int(request.GET.get('per_page', 10))
     page = int(request.GET.get('page', 1))
 
-    return Response(medium.search_recording(query, limit, page))
+    query = request.GET.get('query', '')
+    if query:
+        return Response(medium.search_recording(query, limit, page))
+
+    return Response({'status': 400, 'error': 'Debe indicar una query'})
 
 
 @api_view(['GET'])