diff --git a/Gemfile b/Gemfile
index cfb3144de..34766dd15 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,6 @@ gem 'cancancan'
 gem 'devise', '~> 4.7'
 
 gem 'grape'
-gem 'jbuilder', '2.2.16'  # json api
 
 # registry specfic
 gem 'isikukood' # for EE-id validation
diff --git a/Gemfile.lock b/Gemfile.lock
index 83e8cd549..0dbb10328 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -228,9 +228,6 @@ GEM
     ice_nine (0.11.2)
     isikukood (0.1.2)
     iso8601 (0.8.6)
-    jbuilder (2.2.16)
-      activesupport (>= 3.0.0, < 5)
-      multi_json (~> 1.2)
     jquery-rails (4.0.4)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -488,7 +485,6 @@ DEPENDENCIES
   html2haml (= 2.1.0)
   isikukood
   iso8601 (= 0.8.6)
-  jbuilder (= 2.2.16)
   jquery-rails (= 4.0.4)
   jquery-ui-rails (= 5.0.5)
   kaminari (= 0.16.3)
diff --git a/config/application.rb b/config/application.rb
index f57056960..3c747b4b3 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -65,7 +65,6 @@ module DomainNameRegistry
       g.javascripts false
       g.helper false
       g.template_engine :erb
-      g.jbuilder false
       g.test_framework nil
     end