diff --git a/src/helpers/outputHelper.ts b/src/helpers/outputHelper.ts
index 808634d..db6c7ee 100644
--- a/src/helpers/outputHelper.ts
+++ b/src/helpers/outputHelper.ts
@@ -8,6 +8,15 @@ export default class OutputHelper {
         const outputLines: string[] = [];
 
         if (options.json) {
+            if (options.queryMetadata != null) {
+                return JSON.stringify({
+                    ...result,
+                    query: {
+                        ...response.Query,
+                    }
+                })
+            }
+
             return JSON.stringify(result);
         }
 
diff --git a/tests/helpers/__snapshots__/outputHelper.test.ts.snap b/tests/helpers/__snapshots__/outputHelper.test.ts.snap
index 39e952e..2c6b7e3 100644
--- a/tests/helpers/__snapshots__/outputHelper.test.ts.snap
+++ b/tests/helpers/__snapshots__/outputHelper.test.ts.snap
@@ -15,6 +15,8 @@ Url = https://preview.redd.it/d5yno653zf7d1.jpg?width=640&crop=smart&auto=webp&s
 
 exports[`GenerateOutput GIVEN options.json is true, EXPECT output to be returned as JSON 1`] = `"{"Archived":false,"Author":"author","Downs":0,"Hidden":false,"Permalink":"/r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/","Subreddit":"Rabbits","SubredditSubscribers":654751,"Title":"This is my Ms Bear!","Ups":17,"Url":"https://preview.redd.it/d5yno653zf7d1.jpg?width=640&crop=smart&auto=webp&s=5064d1caec3c12ac2855eb57ff131d0b313d5e9d"}"`;
 
+exports[`GenerateOutput GIVEN options.queryMetadata AND options.json is supplied, EXPECT query metadata to be in JSON format 1`] = `"{"Archived":false,"Author":"author","Downs":0,"Hidden":false,"Permalink":"/r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/","Subreddit":"Rabbits","SubredditSubscribers":654751,"Title":"This is my Ms Bear!","Ups":17,"Url":"https://preview.redd.it/d5yno653zf7d1.jpg?width=640&crop=smart&auto=webp&s=5064d1caec3c12ac2855eb57ff131d0b313d5e9d","query":{"subreddit":"rabbits","sortBy":"hot","limit":100}}"`;
+
 exports[`GenerateOutput GIVEN options.queryMetadata is supplied, EXPECT query metadata to be added 1`] = `
 "Archived = false
 Author = author
diff --git a/tests/helpers/outputHelper.test.ts b/tests/helpers/outputHelper.test.ts
index 5e90dc8..24bd1cd 100644
--- a/tests/helpers/outputHelper.test.ts
+++ b/tests/helpers/outputHelper.test.ts
@@ -102,4 +102,39 @@ describe("GenerateOutput", () => {
         // Assert
         expect(result).toMatchSnapshot();
     });
+
+    test("GIVEN options.queryMetadata AND options.json is supplied, EXPECT query metadata to be in JSON format", () => {
+        // Arrange
+        const response = {
+            IsSuccess: true,
+            Query: {
+                subreddit: "rabbits",
+                sortBy: "hot",
+                limit: 100,
+            },
+            Result: {
+                Archived: false,
+                Author: 'author',
+                Downs: 0,
+                Hidden: false,
+                Permalink: "/r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/",
+                Subreddit: "Rabbits",
+                SubredditSubscribers: 654751,
+                Title: "This is my Ms Bear!",
+                Ups: 17,
+                Url: "https://preview.redd.it/d5yno653zf7d1.jpg?width=640&crop=smart&auto=webp&s=5064d1caec3c12ac2855eb57ff131d0b313d5e9d",
+            },
+        } as IReturnResult;
+
+        const options = {
+            json: true,
+            queryMetadata: true,
+        } as ICliOptions;
+
+        // Act
+        const result = OutputHelper.GenerateOutput(response, options);
+
+        // Assert
+        expect(result).toMatchSnapshot();
+    });
 });
\ No newline at end of file